PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0d9fe2a14b

* commit '0d9fe2a14b515d257de11c042d5584e30374eb64':
  Protect against monkey crash

Change-Id: I382c9d82d6ad30c23c1753d99f6c361c91eb415e
This commit is contained in:
Jason Monk
2016-05-20 18:32:33 +00:00
committed by android-build-merger
parent 4a38f28c19 0d9fe2a14b
commit d814e2886d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/datausage/UnrestrictedDataAccess.java
View File

@@ -152,6 +152,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
@Override @Override
public void onRebuildComplete(ArrayList<AppEntry> apps) { public void onRebuildComplete(ArrayList<AppEntry> apps) {
if (getContext() == null) return;
cacheRemoveAllPrefs(getPreferenceScreen()); cacheRemoveAllPrefs(getPreferenceScreen());
final int N = apps.size(); final int N = apps.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
@@ -159,7 +160,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
String key = entry.info.packageName + "|" + entry.info.uid; String key = entry.info.packageName + "|" + entry.info.uid;
AccessPreference preference = (AccessPreference) getCachedPreference(key); AccessPreference preference = (AccessPreference) getCachedPreference(key);
if (preference == null) { if (preference == null) {
preference = new AccessPreference(getContext(), entry); preference = new AccessPreference(getPrefContext(), entry);
preference.setKey(key); preference.setKey(key);
preference.setOnPreferenceChangeListener(this); preference.setOnPreferenceChangeListener(this);
getPreferenceScreen().addPreference(preference); getPreferenceScreen().addPreference(preference);