From fd41b4248724f79faed969a33b2ac1d53c1912df Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 20 May 2016 14:15:10 -0400 Subject: [PATCH] Protect against monkey crash When rebuild comes in after context is no longer valid Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a Fixes: 28875397 --- src/com/android/settings/datausage/UnrestrictedDataAccess.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index 740fe068b1..4239cf7c1c 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -152,6 +152,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment @Override public void onRebuildComplete(ArrayList apps) { + if (getContext() == null) return; cacheRemoveAllPrefs(getPreferenceScreen()); final int N = apps.size(); for (int i = 0; i < N; i++) { @@ -159,7 +160,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment String key = entry.info.packageName + "|" + entry.info.uid; AccessPreference preference = (AccessPreference) getCachedPreference(key); if (preference == null) { - preference = new AccessPreference(getContext(), entry); + preference = new AccessPreference(getPrefContext(), entry); preference.setKey(key); preference.setOnPreferenceChangeListener(this); getPreferenceScreen().addPreference(preference); -- 2.11.0