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

Merge "Fix crash when changing data restriction for non-app UID."

Browse Source
This commit is contained in:
Fan Zhang
2016-09-26 16:01:31 +00:00
committed by Android (Google) Code Review
parent 660a944128 13566f29a5
commit ad7023a406
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,8 @@ package com.android.settings.datausage;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
@@ -26,11 +28,8 @@ import android.view.MenuItem;
import android.view.View;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
@@ -162,6 +161,9 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
final int N = apps.size();
for (int i = 0; i < N; i++) {
AppEntry entry = apps.get(i);
if (!shouldAddPreference(entry)) {
continue;
}
String key = entry.info.packageName + "|" + entry.info.uid;
AccessPreference preference = (AccessPreference) getCachedPreference(key);
if (preference == null) {
@@ -221,6 +223,11 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
return false;
}
@VisibleForTesting
boolean shouldAddPreference(AppEntry app) {
return app != null && UserHandle.isApp(app.info.uid);
}
private class AccessPreference extends SwitchPreference implements DataSaverBackend.Listener {
private final AppEntry mEntry;
private final DataUsageState mState;