commit a10004661cac69622b66303f7ab76a5c3d648a77
author Fan Zhang <zhfan@google.com> Fri Feb 02 12:15:37 2018 -0800
committer Fan Zhang <zhfan@google.com> Fri Feb 02 12:18:39 2018 -0800
tree e9b089b3681bd1a9c3eeb4c30165509425b1b275
parent 7142be563004aff159000d55b99accc56e5ee1e2

Fix NPE when instantiating SettingsPreferenceFragment

Change-Id: I3997d6436f358b802dff9be307c36031f4351ab4
Fixes: 72868191
Test: robotests

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;
     }