Clean up fully rolled out PowerExemptionBgUsageFix
Flag was rolled out in Android V.
Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I99e10a2ad2d133810aec4abfcfe2451aa817cb09
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
index 37cfec0..3583f0b 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.aconfig
@@ -207,16 +207,6 @@
}
flag {
- name: "power_exemption_bg_usage_fix"
- namespace: "enterprise"
- description: "Ensure aps with EXEMPT_FROM_POWER_RESTRICTIONS can execute in the background"
- bug: "333379020"
- 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/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index a80ee0f..3f875e4 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -20666,9 +20666,7 @@
// have OP_RUN_ANY_IN_BACKGROUND app op and won't execute in the background. The
// code below grants that app op, and once the exemption is in place, the user
// won't be able to disable background usage anymore.
- if (Flags.powerExemptionBgUsageFix()
- && exemption == EXEMPT_FROM_POWER_RESTRICTIONS
- && newMode == MODE_ALLOWED) {
+ if (exemption == EXEMPT_FROM_POWER_RESTRICTIONS && newMode == MODE_ALLOWED) {
setBgUsageAppOp(appOpsMgr, appInfo);
}
}