Clean up fully rolled out DisallowUserControlBgUsageFix
Flag was rolled out in Android V.
Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I8699ac50ae7538a2de98e0e892236eef5b0bdd89
diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index d92351d..c9d3407 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -1989,10 +1989,8 @@
mAdminProtectedPackages.put(userId, packageNames);
}
}
- if (android.app.admin.flags.Flags.disallowUserControlBgUsageFix()) {
- if (!Flags.avoidIdleCheck() || mInjector.getBootPhase() >= PHASE_BOOT_COMPLETED) {
- postCheckIdleStates(userId);
- }
+ if (!Flags.avoidIdleCheck() || mInjector.getBootPhase() >= PHASE_BOOT_COMPLETED) {
+ postCheckIdleStates(userId);
}
}
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
index 56f4792..37cfec0 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.aconfig
@@ -217,16 +217,6 @@
}
flag {
- name: "disallow_user_control_bg_usage_fix"
- namespace: "enterprise"
- description: "Make DPM.setUserControlDisabledPackages() ensure background usage is allowed"
- bug: "326031059"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
name: "disallow_user_control_stopped_state_fix"
namespace: "enterprise"
description: "Ensure DPM.setUserControlDisabledPackages() clears FLAG_STOPPED for the app"
diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerAllowlistBackend.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerAllowlistBackend.java
index 4f2329b..47a08eb 100644
--- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerAllowlistBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerAllowlistBackend.java
@@ -136,12 +136,10 @@
return true;
}
- if (android.app.admin.flags.Flags.disallowUserControlBgUsageFix()) {
- // App is subject to DevicePolicyManager.setUserControlDisabledPackages() policy.
- final int userId = UserHandle.getUserId(uid);
- if (mAppContext.getPackageManager().isPackageStateProtected(pkg, userId)) {
- return true;
- }
+ // App is subject to DevicePolicyManager.setUserControlDisabledPackages() policy.
+ final int userId = UserHandle.getUserId(uid);
+ if (mAppContext.getPackageManager().isPackageStateProtected(pkg, userId)) {
+ return true;
}
return false;
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java
index e1cb37d..8068d46 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyEnforcerCallbacks.java
@@ -238,9 +238,7 @@
}
for (int user : resolveUsers(userId)) {
- if (Flags.disallowUserControlBgUsageFix()) {
- setBgUsageAppOp(packages, pmi, user, appOpsManager);
- }
+ setBgUsageAppOp(packages, pmi, user, appOpsManager);
if (Flags.disallowUserControlStoppedStateFix()) {
for (String packageName : packages) {
pmi.setPackageStoppedState(packageName, false, user);
