Settings: Add support for per app network isolation (5edbb707) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,8 @@
		<string name="touchscreen_gesture_settings_summary">Perform various touchscreen gestures for quick actions</string>

		<!-- Per-app data restrictions -->
		<string name="data_usage_app_restrict_all">Allow network access</string>
		<string name="data_usage_app_restrict_all_summary">Enable network usage</string>
		<string name="data_usage_app_restrict_data">Cellular data</string>
		<string name="data_usage_app_restrict_data_summary">Enable usage of cellular data</string>
		<string name="data_usage_app_restrict_vpn">VPN data</string>

res/xml/app_data_usage.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@
		android:key="app_settings"
		android:title="@string/data_usage_app_settings" />

		<com.android.settingslib.RestrictedSwitchPreference
		android:key="restrict_all"
		android:title="@string/data_usage_app_restrict_all"
		android:summary="@string/data_usage_app_restrict_all_summary" />

		<com.android.settingslib.RestrictedSwitchPreference
		android:key="restrict_wlan"
		android:title="@string/data_usage_app_restrict_wifi"

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

+54 −11

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		package com.android.settings.datausage;

		import static android.net.NetworkPolicyManager.POLICY_NETWORK_ISOLATED;
		import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
		import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;
		import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_VPN;
		@@ -74,6 +75,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		private static final String KEY_BACKGROUND_USAGE = "background_usage";
		private static final String KEY_APP_SETTINGS = "app_settings";
		private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
		private static final String KEY_RESTRICT_ALL = "restrict_all";
		private static final String KEY_RESTRICT_DATA = "restrict_data";
		private static final String KEY_RESTRICT_VPN = "restrict_vpn";
		private static final String KEY_RESTRICT_WLAN = "restrict_wlan";
		@@ -91,6 +93,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		private Preference mBackgroundUsage;
		private Preference mAppSettings;
		private RestrictedSwitchPreference mRestrictBackground;
		private RestrictedSwitchPreference mRestrictAll;
		private RestrictedSwitchPreference mRestrictData;
		private RestrictedSwitchPreference mRestrictVpn;
		private RestrictedSwitchPreference mRestrictWlan;
		@@ -168,6 +171,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		mLabel = uidDetail.label;
		removePreference(KEY_UNRESTRICTED_DATA);
		removePreference(KEY_RESTRICT_BACKGROUND);
		removePreference(KEY_RESTRICT_ALL);
		removePreference(KEY_RESTRICT_DATA);
		removePreference(KEY_RESTRICT_VPN);
		removePreference(KEY_RESTRICT_WLAN);
		@@ -184,6 +188,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		}
		mRestrictBackground = findPreference(KEY_RESTRICT_BACKGROUND);
		mRestrictBackground.setOnPreferenceChangeListener(this);
		mRestrictAll = findPreference(KEY_RESTRICT_ALL);
		mRestrictAll.setOnPreferenceChangeListener(this);
		mRestrictData = findPreference(KEY_RESTRICT_DATA);
		mRestrictData.setOnPreferenceChangeListener(this);
		mRestrictVpn = findPreference(KEY_RESTRICT_VPN);
		@@ -230,6 +236,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		removePreference(KEY_UNRESTRICTED_DATA);
		removePreference(KEY_APP_SETTINGS);
		removePreference(KEY_RESTRICT_BACKGROUND);
		removePreference(KEY_RESTRICT_ALL);
		removePreference(KEY_RESTRICT_DATA);
		removePreference(KEY_RESTRICT_VPN);
		removePreference(KEY_RESTRICT_WLAN);
		@@ -262,6 +269,10 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
		updatePrefs();
		return true;
		} else if (preference == mRestrictAll) {
		setAppRestrictAll(!(Boolean) newValue);
		updatePrefs();
		return true;
		} else if (preference == mRestrictData) {
		setAppRestrictData(!(Boolean) newValue);
		updatePrefs();
		@@ -305,7 +316,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		@VisibleForTesting
		void updatePrefs() {
		updatePrefs(getAppRestrictBackground(), getUnrestrictData(),
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan());
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan(),
		getAppRestrictAll());
		}

		@VisibleForTesting
		@@ -314,39 +326,60 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		}

		private void updatePrefs(boolean restrictBackground, boolean unrestrictData,
		boolean restrictData, boolean restrictVpn, boolean restrictWlan) {
		boolean restrictData, boolean restrictVpn, boolean restrictWlan, boolean restrictAll) {
		final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
		mContext, mPackageName, UserHandle.getUserId(mAppItem.key));
		if (mRestrictBackground != null) {
		if (restrictData) {
		if (restrictData \|\| restrictAll) {
		mRestrictBackground.setEnabled(false);
		mRestrictBackground.setChecked(false);
		} else {
		mRestrictBackground.setEnabled(true);
		mRestrictBackground.setChecked(!restrictBackground);
		}
		mRestrictBackground.setDisabledByAdmin(admin);
		}
		}
		if (mRestrictAll != null) {
		mRestrictAll.setChecked(!restrictAll);
		}
		if (mRestrictData != null) {
		if (restrictAll) {
		mRestrictData.setEnabled(false);
		mRestrictData.setChecked(false);
		} else {
		mRestrictData.setEnabled(true);
		mRestrictData.setChecked(!restrictData);
		}
		}
		if (mRestrictVpn != null) {
		if (restrictAll) {
		mRestrictVpn.setEnabled(false);
		mRestrictVpn.setChecked(false);
		} else {
		mRestrictVpn.setEnabled(true);
		mRestrictVpn.setChecked(!restrictVpn);
		}
		}
		if (mRestrictWlan != null) {
		if (restrictAll) {
		mRestrictWlan.setEnabled(false);
		mRestrictWlan.setChecked(false);
		} else {
		mRestrictWlan.setEnabled(true);
		mRestrictWlan.setChecked(!restrictWlan);
		}
		}
		if (mUnrestrictedData != null) {
		if (restrictData \|\| restrictBackground) {
		if (restrictData \|\| restrictBackground \|\| restrictAll) {
		mUnrestrictedData.setEnabled(false);
		mUnrestrictedData.setChecked(false);
		} else {
		mUnrestrictedData.setEnabled(true);
		mUnrestrictedData.setChecked(unrestrictData);
		}
		mUnrestrictedData.setDisabledByAdmin(admin);
		}
		}
		}

		private void addUid(int uid) {
		String[] packages = mPackageManager.getPackagesForUid(uid);
		@@ -380,6 +413,10 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		return getAppRestriction(POLICY_REJECT_METERED_BACKGROUND);
		}

		private boolean getAppRestrictAll() {
		return getAppRestriction(POLICY_NETWORK_ISOLATED);
		}

		private boolean getAppRestrictData() {
		return getAppRestriction(POLICY_REJECT_ON_DATA);
		}
		@@ -405,6 +442,10 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		return (uidPolicy & policy) != 0;
		}

		private void setAppRestrictAll(boolean restrict) {
		setAppRestriction(POLICY_NETWORK_ISOLATED, restrict);
		}

		private void setAppRestrictData(boolean restrict) {
		setAppRestriction(POLICY_REJECT_ON_DATA, restrict);
		}
		@@ -558,7 +599,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
		if (mAppItem.uids.get(uid, false)) {
		updatePrefs(getAppRestrictBackground(), isWhitelisted,
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan());
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan(),
		getAppRestrictAll());
		}
		}

		@@ -566,7 +608,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
		if (mAppItem.uids.get(uid, false)) {
		updatePrefs(isBlacklisted, getUnrestrictData(),
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan());
		getAppRestrictData(), getAppRestrictVpn(), getAppRestrictWlan(),
		getAppRestrictAll());
		}
		}
		}