commit 00e73e75d5092a99fd58b1e0b86a7b5d9c3cbcfb
author Jason Monk <jmonk@google.com> Fri May 20 18:24:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 20 18:24:35 2016 +0000
tree 397a21c2e6a9e5e1463931beab7cb2d32f8c8d7a
parent 2c04e724148556aacbb3956b39af04a16e2a385e
parent d3ce331b94af2c896864f78459c8656629d3455f

Merge "Protect against monkey crash" into nyc-dev
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a

src/com/android/settings/datausage/UnrestrictedDataAccess.java

diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index 740fe06..4239cf7 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -152,6 +152,7 @@
 
     @Override
     public void onRebuildComplete(ArrayList<AppEntry> apps) {
+        if (getContext() == null) return;
         cacheRemoveAllPrefs(getPreferenceScreen());
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
@@ -159,7 +160,7 @@
             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);