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

Merge \\"Make sure to clear out preference cache when done\\" into nyc-mr1-dev am: 9b0931e986

Browse Source 
am: d1a54dc62a

Change-Id: I07e1c9725cd6880d7b974e318959cb746ab014b4
This commit is contained in:
Jason Monk
2016-07-15 17:55:57 +00:00
committed by android-build-merger
parent cd4b145d80 d1a54dc62a
commit 4c5f408e26
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,10 +392,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
for (Preference p : mPreferenceCache.values()) { for (Preference p : mPreferenceCache.values()) {
group.removePreference(p); group.removePreference(p);
} }
mPreferenceCache = null;
} }
protected int getCachedCount() { protected int getCachedCount() {
return mPreferenceCache.size(); return mPreferenceCache != null ? mPreferenceCache.size() : 0;
} }
private void highlightPreference(String key) { private void highlightPreference(String key) {