commit da52f08b0a86182cef1f0949f0ef45d5efa092cc
author Jason Monk <jmonk@google.com> Fri May 27 16:51:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 27 16:51:59 2016 +0000
tree e268a28e412ac241de5bdb5b520718fb93395759
parent 24aa3b01af017c0d020a4e31ff88203f20140ce3
parent 9b926c0bc6201dfb6ab30262e5d5b436131a0e6a

Merge "Don't allow restricted data usage of system" into nyc-dev

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

diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 41cee97..e0dc389 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -149,10 +149,15 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
-            mRestrictBackground.setOnPreferenceChangeListener(this);
-            mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
-            mUnrestrictedData.setOnPreferenceChangeListener(this);
+            if (mAppItem.key == Process.SYSTEM_UID) {
+                removePreference(KEY_UNRESTRICTED_DATA);
+                removePreference(KEY_RESTRICT_BACKGROUND);
+            } else {
+                mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);
+                mRestrictBackground.setOnPreferenceChangeListener(this);
+                mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);
+                mUnrestrictedData.setOnPreferenceChangeListener(this);
+            }
             mDataSaverBackend = new DataSaverBackend(getContext());
             mAppSettings = findPreference(KEY_APP_SETTINGS);