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

am: 9b0931e986 Change-Id: Ifc03fb29a5c4404448e6f1bfb844c7688b7f0810
2016-07-15 17:05:47 +00:00
parent 67cf3e6a88 9b0931e986
commit d1a54dc62a
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) {