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

2016-07-15 16:55:14 +00:00
parent 080f794b6e db7868ef25
commit 9b0931e986
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) {