From db7868ef255eaf7ad2e1f7871718b9fa3cc825d5 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 30 Jun 2016 15:17:57 -0400
Subject: [PATCH] Make sure to clear out preference cache when done

Change-Id: I05b420dcab67622782b3c1a3971c1a5a0b74ad56
Fixes: 29314480
---
 src/com/android/settings/SettingsPreferenceFragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 4796a9e997..130137fba8 100644
--- 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) {
-- 
2.11.0