Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: cb0e0f9e30
am: 0d9fe2a14b
* commit '0d9fe2a14b515d257de11c042d5584e30374eb64':
Protect against monkey crash
Change-Id: I382c9d82d6ad30c23c1753d99f6c361c91eb415e
This commit is contained in:
@@ -152,6 +152,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
|
||||
|
||||
@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 @@ 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);
|
||||
|
||||
Reference in New Issue
Block a user