commit 1cb12bbd604182c303756a55f500c6cfde417a54
author Jason Monk <jmonk@google.com> Tue Mar 29 13:21:48 2016 -0400
committer Jason Monk <jmonk@google.com> Tue Mar 29 13:21:48 2016 -0400
tree c8d55be01faab2f763bb55c2300bd3593ba7f6ca
parent f19001f2c0517b478dd07feb9b7427a1b506adb1

Fix crash when clearing preference screen

Bug: 27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index e1cf58b..16df343 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -305,7 +305,7 @@
 
     @Override
     public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
-        if (!preferenceScreen.isAttached()) {
+        if (preferenceScreen != null && !preferenceScreen.isAttached()) {
             // Without ids generated, the RecyclerView won't animate changes to the preferences.
             preferenceScreen.setShouldUseGeneratedIds(mAnimationAllowed);
         }