From a10004661cac69622b66303f7ab76a5c3d648a77 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 2 Feb 2018 12:15:37 -0800
Subject: [PATCH] Fix NPE when instantiating SettingsPreferenceFragment

Change-Id: I3997d6436f358b802dff9be307c36031f4351ab4
Fixes: 72868191
Test: robotests
---
 src/com/android/settings/SettingsPreferenceFragment.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2a593c277d9..2fceb6399a0 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -339,8 +339,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
 
     @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;
     }