commit b0c7609052f1b3e60c253f52dc2330c20ce498f4
author Fan Zhang <zhfan@google.com> Mon Mar 05 23:43:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 05 23:43:05 2018 +0000
tree c1ca3d03f89c836e65d617735f659d6b1936455d
parent e8666c6664de66e9016687e313ce43efdc701085
parent a00ed0aad63a6ce5504dea15311a87d70a398c5a

Merge "Fix double help icon in wificalling screen" into pi-dev

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 {