Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Add support for allowing/disallowing apps on restricted networks

Browse Source 
*) Add option to disable all network traffic
   in app data usage settings.

*) Disable the existing background data and unrestricted
   data usage options when all network traffic is
   disabled.

Change-Id: I0aaf5703d6dd5d6e6ec3cda3940f28833fe052ea
This commit is contained in:
Sam Mortimer
2020-05-26 20:53:59 -07:00
committed by Michael Bestas
parent fa351b4335
commit 0b57abfdec
3 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/cm_strings.xml
View File

@@ -60,6 +60,10 @@
<string name="show_navbar_hint_title">Navigation hint</string>
<string name="show_navbar_hint_summary">Show navigation hint bar at the bottom of the screen</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>
<!-- PIN scramble -->
<string name="unlock_scramble_pin_layout_title">Scramble layout</string>
<string name="unlock_scramble_pin_layout_summary">Scramble PIN layout when unlocking device</string>

5
res/xml/app_data_usage.xml
View File

@@ -42,6 +42,11 @@
android:title="@string/data_usage_app_settings"
settings:controller="com.android.settings.datausage.AppDataUsageAppSettingsController" />
<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_background"
android:title="@string/data_usage_app_restrict_background"

51
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -26,6 +26,7 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.net.ConnectivitySettingsManager;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.os.UserHandle;
@@ -60,6 +61,7 @@ import kotlin.Unit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceChangeListener,
DataSaverBackend.Listener {
@@ -73,11 +75,13 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
static final String ARG_NETWORK_CYCLES = "network_cycles";
static final String ARG_SELECTED_CYCLE = "selected_cycle";
private static final String KEY_RESTRICT_ALL = "restrict_all";
private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
private PackageManager mPackageManager;
private final ArraySet<String> mPackages = new ArraySet<>();
private RestrictedSwitchPreference mRestrictAll;
private RestrictedSwitchPreference mRestrictBackground;
private Drawable mIcon;
@@ -147,6 +151,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
mIcon = uidDetail.icon;
mLabel = uidDetail.label;
removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_RESTRICT_ALL);
removePreference(KEY_RESTRICT_BACKGROUND);
} else {
if (mPackages.size() != 0) {
@@ -161,6 +166,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
}
use(AppDataUsageAppSettingsController.class).init(mPackages, userId);
}
mRestrictAll = findPreference(KEY_RESTRICT_ALL);
mRestrictAll.setOnPreferenceChangeListener(this);
mRestrictBackground = findPreference(KEY_RESTRICT_BACKGROUND);
mRestrictBackground.setOnPreferenceChangeListener(this);
mUnrestrictedData = findPreference(KEY_UNRESTRICTED_DATA);
@@ -177,6 +184,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
mPackageName = context.getPackageName();
removePreference(KEY_UNRESTRICTED_DATA);
removePreference(KEY_RESTRICT_ALL);
removePreference(KEY_RESTRICT_BACKGROUND);
}
@@ -219,6 +227,17 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
updatePrefs();
return true;
} else if (preference == mRestrictAll) {
Set<Integer> uids =
ConnectivitySettingsManager.getUidsAllowedOnRestrictedNetworks(mContext);
if (!(Boolean) newValue) {
uids.remove(mAppItem.key);
} else {
uids.add(mAppItem.key);
}
ConnectivitySettingsManager.setUidsAllowedOnRestrictedNetworks(mContext, uids);
updatePrefs();
return true;
} else if (preference == mUnrestrictedData) {
mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
return true;
@@ -238,7 +257,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
@VisibleForTesting
void updatePrefs() {
updatePrefs(getAppRestrictBackground(), getUnrestrictData());
updatePrefs(getAppRestrictBackground(), getUnrestrictData(), getAppRestrictAll());
}
@VisibleForTesting
@@ -279,7 +298,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
}
}
private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
private void updatePrefs(boolean restrictBackground, boolean unrestrictData,
boolean restrictAll) {
if (!isSimHardwareVisible(mContext)) {
return;
}
@@ -287,18 +307,20 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
final EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfMeteredDataUsageUserControlDisabled(mContext, mPackageName,
UserHandle.getUserId(mAppItem.key));
if (mRestrictAll != null) {
mRestrictAll.setChecked(!restrictAll);
}
if (mRestrictBackground != null) {
mRestrictBackground.setChecked(!restrictBackground);
mRestrictBackground.setDisabledByAdmin(admin);
mRestrictBackground.setEnabled(!mRestrictBackground.isDisabledByAdmin() &&
!restrictAll);
mRestrictBackground.setChecked(!restrictBackground && !restrictAll);
}
if (mUnrestrictedData != null) {
if (restrictBackground) {
mUnrestrictedData.setVisible(false);
} else {
mUnrestrictedData.setVisible(true);
mUnrestrictedData.setChecked(unrestrictData);
mUnrestrictedData.setDisabledByAdmin(admin);
}
mUnrestrictedData.setDisabledByAdmin(admin);
mUnrestrictedData.setEnabled(!mUnrestrictedData.isDisabledByAdmin() &&
!restrictBackground && !restrictAll);
mUnrestrictedData.setChecked(unrestrictData && !restrictBackground && !restrictAll);
}
}
@@ -316,6 +338,11 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
&& DynamicDenylistManager.getInstance(mContext).isInManualDenylist(uid);
}
private boolean getAppRestrictAll() {
return !ConnectivitySettingsManager.getUidsAllowedOnRestrictedNetworks(mContext)
.contains(mAppItem.key);
}
private boolean getUnrestrictData() {
if (mDataSaverBackend != null) {
return mDataSaverBackend.isAllowlisted(mAppItem.key);
@@ -365,14 +392,14 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
@Override
public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
if (mAppItem.uids.get(uid, false)) {
updatePrefs(getAppRestrictBackground(), isAllowlisted);
updatePrefs(getAppRestrictBackground(), isAllowlisted, getAppRestrictAll());
}
}
@Override
public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
if (mAppItem.uids.get(uid, false)) {
updatePrefs(isDenylisted, getUnrestrictData());
updatePrefs(isDenylisted, getUnrestrictData(), getAppRestrictAll());
}
}
}