From 1cb12bbd604182c303756a55f500c6cfde417a54 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 29 Mar 2016 13:21:48 -0400
Subject: [PATCH] Fix crash when clearing preference screen

Bug: 27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
---
 src/com/android/settings/SettingsPreferenceFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index e1cf58bdaa4..16df343d53f 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -305,7 +305,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
 
     @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);
         }