commit d35484f531d297dff7f03926285d76369076eda4
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 03 02:34:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 03 02:34:26 2018 +0000
tree 78836f45197dce9277e40d82e858a6a5ced79458
parent 6a4c3301ec2dc8b44ed631f143fbb26616bdb506
parent f6b5dad77c334f3417b764222bdb0b6c9ace0e24

Merge "Unregister broadcast receiver from AppInfoDashboardFragment."

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2a593c2..2fceb63 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -339,8 +339,10 @@
 
     @Override
     protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
+        final Bundle arguments = getArguments();
         mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen,
-                getArguments().getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),
+                arguments == null
+                        ? null : arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),
                 mPreferenceHighlighted);
         return mAdapter;
     }