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

Apply dynamic deny list into data usage state

Browse Source 
- Initiate and sync existing network policy when creating the instance
 - Imple a method to suggest list of packages to set as POLICY_REJECT
 - Reset/clear the policy settings once clear storage or reset
   preference

Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I10ba28fee08c29bc2092820fbc8d8ac0e61d30e7
This commit is contained in:
Wesley Wang
2023-11-08 20:29:45 +08:00
parent 855307c73e
commit f0b67ef0f9
8 changed files with 432 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -53,6 +53,7 @@ import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.Callbacks;
@@ -359,6 +360,8 @@ public class AppStorageSettings extends AppInfoWithHeader
mButtonsPref.setButton1Enabled(false);
// Invoke uninstall or clear user data based on sysPackage
String packageName = mAppEntry.info.packageName;
DynamicDenylistManager.getInstance(getContext())
.resetDenylistIfNeeded(packageName, /* force= */ false);
Log.i(TAG, "Clearing user data for package : " + packageName);
if (mClearDataObserver == null) {
mClearDataObserver = new ClearUserDataObserver();

3
src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
View File

@@ -39,6 +39,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryOptimizeUtils;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
import java.util.Arrays;
import java.util.List;
@@ -155,6 +156,8 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
}
mAom.resetAllModes();
BatteryOptimizeUtils.resetAppOptimizationMode(mContext, mIPm, mAom);
DynamicDenylistManager.getInstance(mContext)
.resetDenylistIfNeeded(/* packageName= */ null, /* force= */ true);
final int[] restrictedUids = mNpm.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND);
final int currentUserId = ActivityManager.getCurrentUser();
for (int uid : restrictedUids) {

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

@@ -44,6 +44,7 @@ import com.android.settings.applications.AppInfoBase;
import com.android.settings.datausage.lib.AppDataUsageDetailsRepository;
import com.android.settings.datausage.lib.NetworkTemplates;
import com.android.settings.datausage.lib.NetworkUsageDetailsData;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
@@ -325,7 +326,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
private boolean getAppRestrictBackground() {
final int uid = mAppItem.key;
final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);
return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0
&& DynamicDenylistManager.getInstance(mContext).isInManualDenylist(uid);
}
private boolean getUnrestrictData() {

10
src/com/android/settings/datausage/DataSaverBackend.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.net.NetworkPolicyManager;
import android.util.SparseIntArray;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
@@ -39,6 +40,7 @@ public class DataSaverBackend {
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final NetworkPolicyManager mPolicyManager;
private final DynamicDenylistManager mDynamicDenylistManager;
private final ArrayList<Listener> mListeners = new ArrayList<>();
private SparseIntArray mUidPolicies = new SparseIntArray();
private boolean mAllowlistInitialized;
@@ -50,6 +52,7 @@ public class DataSaverBackend {
mContext = context.getApplicationContext();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mPolicyManager = NetworkPolicyManager.from(mContext);
mDynamicDenylistManager = DynamicDenylistManager.getInstance(mContext);
}
public void addListener(Listener listener) {
@@ -83,7 +86,7 @@ public class DataSaverBackend {
public void setIsAllowlisted(int uid, String packageName, boolean allowlisted) {
final int policy = allowlisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy);
mDynamicDenylistManager.setUidPolicyLocked(uid, policy);
mUidPolicies.put(uid, policy);
if (allowlisted) {
mMetricsFeatureProvider.action(
@@ -113,7 +116,7 @@ public class DataSaverBackend {
public void setIsDenylisted(int uid, String packageName, boolean denylisted) {
final int policy = denylisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy);
mDynamicDenylistManager.setUidPolicyLocked(uid, policy);
mUidPolicies.put(uid, policy);
if (denylisted) {
mMetricsFeatureProvider.action(
@@ -123,7 +126,8 @@ public class DataSaverBackend {
public boolean isDenylisted(int uid) {
loadDenylist();
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND;
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND
&& mDynamicDenylistManager.isInManualDenylist(uid);
}
private void loadDenylist() {

3
src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
View File

@@ -26,6 +26,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleRadioButtonsController;
import com.android.settings.fuelgauge.datasaver.DynamicDenylistManager;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
import java.util.List;
@@ -51,6 +52,8 @@ public final class BatterySettingsMigrateChecker extends BroadcastReceiver {
context = context.getApplicationContext();
verifySaverConfiguration(context);
verifyBatteryOptimizeModes(context);
// Initialize and sync settings into SharedPreferences for migration.
DynamicDenylistManager.getInstance(context);
}
/** Avoid users set important apps into the unexpected battery optimize modes */

158
src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManager.java
View File

@@ -16,12 +16,24 @@
package com.android.settings.fuelgauge.datasaver;
import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static com.android.settings.fuelgauge.BatteryUtils.UID_ZERO;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.net.NetworkPolicyManager;
import android.util.ArraySet;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import java.util.List;
import java.util.Set;
/** A class to dynamically manage per apps {@link NetworkPolicyManager} POLICY_ flags. */
public final class DynamicDenylistManager {
@@ -29,47 +41,157 @@ public final class DynamicDenylistManager {
private static final String PREF_KEY_MANUAL_DENY = "manual_denylist_preference";
private static final String PREF_KEY_DYNAMIC_DENY = "dynamic_denylist_preference";
private static DynamicDenylistManager sInstance;
private final Context mContext;
private final NetworkPolicyManager mNetworkPolicyManager;
private final Object mLock = new Object();
private static DynamicDenylistManager sInstance;
@VisibleForTesting
static final String PREF_KEY_MANUAL_DENYLIST_SYNCED = "manual_denylist_synced";
/** @return a DynamicDenylistManager object */
public static DynamicDenylistManager getInstance(Context context) {
synchronized (DynamicDenylistManager.class) {
if (sInstance == null) {
sInstance = new DynamicDenylistManager(context);
sInstance = new DynamicDenylistManager(
context, NetworkPolicyManager.from(context));
}
return sInstance;
}
}
DynamicDenylistManager(Context context) {
@VisibleForTesting
DynamicDenylistManager(Context context, NetworkPolicyManager networkPolicyManager) {
mContext = context.getApplicationContext();
mNetworkPolicyManager = NetworkPolicyManager.from(mContext);
mNetworkPolicyManager = networkPolicyManager;
syncPolicyIfNeeded();
}
/** Update the target uid policy in {@link #getManualDenylistPref()}. */
public void updateManualDenylist(String uid, int policy) {
if (policy != NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND) {
getManualDenylistPref().edit().remove(uid).apply();
} else {
getManualDenylistPref().edit().putInt(uid, policy).apply();
/** Sync the policy from {@link NetworkPolicyManager} if needed. */
private void syncPolicyIfNeeded() {
if (getManualDenylistPref().contains(PREF_KEY_MANUAL_DENYLIST_SYNCED)) {
Log.i(TAG, "syncPolicyIfNeeded() ignore synced manual denylist");
return;
}
final SharedPreferences.Editor editor = getManualDenylistPref().edit();
final int[] existedUids = mNetworkPolicyManager
.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND);
if (existedUids != null && existedUids.length != 0) {
for (int uid : existedUids) {
editor.putInt(String.valueOf(uid), POLICY_REJECT_METERED_BACKGROUND);
}
}
editor.putInt(PREF_KEY_MANUAL_DENYLIST_SYNCED, POLICY_NONE).apply();
}
/** Set policy flags for specific UID. */
public void setUidPolicyLocked(int uid, int policy) {
synchronized (mLock) {
mNetworkPolicyManager.setUidPolicy(uid, policy);
}
updateDenylistPref(uid, policy);
}
/** Suggest a list of package to set as POLICY_REJECT. */
public void setDenylist(List<String> packageNameList) {
final Set<Integer> denylistTargetUids = new ArraySet<>(packageNameList.size());
for (String packageName : packageNameList) {
try {
final int uid = mContext.getPackageManager().getPackageUid(packageName, 0);
if (uid == UID_ZERO) {
continue;
}
denylistTargetUids.add(uid);
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Unknown package name: " + packageName, e);
}
}
final Set<Integer> manualDenylistUids = getDenylistAllUids(getManualDenylistPref());
denylistTargetUids.removeAll(manualDenylistUids);
final Set<Integer> lastDynamicDenylistUids = getDenylistAllUids(getDynamicDenylistPref());
if (lastDynamicDenylistUids.equals(denylistTargetUids)) {
Log.i(TAG, "setDenylist() ignore the same denylist with size: "
+ lastDynamicDenylistUids.size());
return;
}
// Store target denied uids into DynamicDenylistPref.
final SharedPreferences.Editor editor = getDynamicDenylistPref().edit();
editor.clear();
denylistTargetUids.forEach(
uid -> editor.putInt(String.valueOf(uid), POLICY_REJECT_METERED_BACKGROUND));
editor.apply();
// Set new added UIDs into REJECT policy.
synchronized (mLock) {
for (int uid : denylistTargetUids) {
if (!lastDynamicDenylistUids.contains(uid)) {
mNetworkPolicyManager.setUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
}
}
}
// Unset removed UIDs back to NONE policy.
synchronized (mLock) {
for (int uid : lastDynamicDenylistUids) {
if (!denylistTargetUids.contains(uid)) {
mNetworkPolicyManager.setUidPolicy(uid, POLICY_NONE);
}
}
}
}
/** Return true if the target uid is in {@link #getManualDenylistPref()}. */
public boolean isInManualDenylist(String uid) {
return getManualDenylistPref().contains(uid);
public boolean isInManualDenylist(int uid) {
return getManualDenylistPref().contains(String.valueOf(uid));
}
/** Clear all data in {@link #getManualDenylistPref()} */
public void clearManualDenylistPref() {
/** Reset the UIDs in the denylist if needed. */
public void resetDenylistIfNeeded(String packageName, boolean force) {
if (!force && !SETTINGS_PACKAGE_NAME.equals(packageName)) {
return;
}
synchronized (mLock) {
for (int uid : mNetworkPolicyManager
.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
if (!getDenylistAllUids(getManualDenylistPref()).contains(uid)) {
mNetworkPolicyManager.setUidPolicy(uid, POLICY_NONE);
}
}
}
clearSharedPreferences();
}
private Set<Integer> getDenylistAllUids(SharedPreferences sharedPreferences) {
final ArraySet<Integer> uids = new ArraySet<>();
for (String key : sharedPreferences.getAll().keySet()) {
if (PREF_KEY_MANUAL_DENYLIST_SYNCED.equals(key)) {
continue;
}
try {
uids.add(Integer.parseInt(key));
} catch (NumberFormatException e) {
Log.e(TAG, "getDenylistAllUids() unexpected format for " + key);
}
}
return uids;
}
void updateDenylistPref(int uid, int policy) {
final String uidString = String.valueOf(uid);
if (policy != POLICY_REJECT_METERED_BACKGROUND) {
getManualDenylistPref().edit().remove(uidString).apply();
} else {
getManualDenylistPref().edit().putInt(uidString, policy).apply();
}
getDynamicDenylistPref().edit().remove(uidString).apply();
}
void clearSharedPreferences() {
getManualDenylistPref().edit().clear().apply();
}
/** Clear all data in {@link #getDynamicDenylistPref()} */
public void clearDynamicDenylistPref() {
getDynamicDenylistPref().edit().clear().apply();
}