Make sure to clear out preference cache when done

Change-Id: I05b420dcab67622782b3c1a3971c1a5a0b74ad56 Fixes: 29314480
2016-06-30 15:17:57 -04:00
parent 6e1336bff1
commit db7868ef25
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -399,10 +399,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
        for (Preference p : mPreferenceCache.values()) {
            group.removePreference(p);
        }
+        mPreferenceCache = null;
    }

    protected int getCachedCount() {
-        return mPreferenceCache.size();
+        return mPreferenceCache != null ? mPreferenceCache.size() : 0;
    }

    private void highlightPreference(String key) {