Merge "Don\'t allow restricted data usage of system" into nyc-dev am: da52f08b0a

am: ef19af788c

* commit 'ef19af788c6698070dcb8017d084b746bde73abd':
  Don't allow restricted data usage of system

Change-Id: Id7dfcfab1f700b861616dfc9e43a348343f5c64b
This commit is contained in:
Jason Monk
2016-05-27 17:12:57 +00:00
committed by android-build-merger

View File

@@ -149,10 +149,15 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
} }
} }
mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND); if (mAppItem.key == Process.SYSTEM_UID) {
mRestrictBackground.setOnPreferenceChangeListener(this); removePreference(KEY_UNRESTRICTED_DATA);
mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA); removePreference(KEY_RESTRICT_BACKGROUND);
mUnrestrictedData.setOnPreferenceChangeListener(this); } else {
mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
mRestrictBackground.setOnPreferenceChangeListener(this);
mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
mUnrestrictedData.setOnPreferenceChangeListener(this);
}
mDataSaverBackend = new DataSaverBackend(getContext()); mDataSaverBackend = new DataSaverBackend(getContext());
mAppSettings = findPreference(KEY_APP_SETTINGS); mAppSettings = findPreference(KEY_APP_SETTINGS);