commit e8666c6664de66e9016687e313ce43efdc701085
author Fan Zhang <zhfan@google.com> Fri Mar 02 11:01:15 2018 -0800
committer Fan Zhang <zhfan@google.com> Mon Mar 05 21:35:31 2018 +0000
tree 68770a579c4f6de655fd60ca17f5f778428ecf9a
parent 22a39c2b93bc66db71238274a7683d329232d124

Correctly propagate bundle extra from intent to fragment

When someone launches settings intent and include args for fragment, we
should propagate the args to fragment.

Change-Id: I231a675123f056043e96ffad7498da6b9bc16687
Fixes: 74017572
Test: manual

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8b71df1..15b3c66 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -523,7 +523,7 @@
         if (startingFragment != null) {
             Intent modIntent = new Intent(superIntent);
             modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment);
-            Bundle args = superIntent.getExtras();
+            Bundle args = superIntent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
             if (args != null) {
                 args = new Bundle(args);
             } else {