PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2c1bfe3

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

Change-Id: I5202056167c539420465cd01afd58dc8d1dc3b61
This commit is contained in:
Jason Monk
2016-03-29 17:30:26 +00:00
committed by android-build-merger
parent fd1ae344be 2c1bfe37c1
commit e86d54d041
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -305,7 +305,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
@Override @Override
public void setPreferenceScreen(PreferenceScreen preferenceScreen) { 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. // Without ids generated, the RecyclerView won't animate changes to the preferences.
preferenceScreen.setShouldUseGeneratedIds(mAnimationAllowed); preferenceScreen.setShouldUseGeneratedIds(mAnimationAllowed);
} }