Merge "Fix crash when clearing preference screen" into nyc-dev am: 2c313f0

am: 2c1bfe3

* commit '2c1bfe37c1017c7d5989c5a9227a2a6b57185e7c':
  Fix crash when clearing preference screen

Change-Id: I5202056167c539420465cd01afd58dc8d1dc3b61

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