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

Browse Source 
am: 9b0931e986

Change-Id: Ifc03fb29a5c4404448e6f1bfb844c7688b7f0810
This commit is contained in:
Jason Monk
2016-07-15 17:05:47 +00:00
committed by android-build-merger
parent 67cf3e6a88 9b0931e986
commit d1a54dc62a
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

@@ -399,10 +399,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) {