From d3684f7d1ded44dddd7a834894535c92fd488158 Mon Sep 17 00:00:00 2001 From: ykhung Date: Mon, 30 Oct 2023 10:45:05 +0800 Subject: [PATCH] Rename for: force app stay in the battery optimize mode Bug: 306506148 Test: atest & presubmit Change-Id: I69a0c6b290c21ae1fca676ffe8295543b2323a7a --- res/values/config.xml | 4 ++-- .../settings/fuelgauge/BatteryBackupHelper.java | 2 +- .../settings/fuelgauge/BatteryOptimizeUtils.java | 6 +++--- .../fuelgauge/BatterySettingsMigrateChecker.java | 9 +++++---- .../fuelgauge/BatterySettingsMigrateCheckerTest.java | 12 ++++++------ 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/res/values/config.xml b/res/values/config.xml index 443f8155295..f60b58c7ec0 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -529,8 +529,8 @@ content://com.android.settings.slices/intent/media_output_indicator - - + + diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java index 4dabe12e1bd..76200fef746 100644 --- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java +++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java @@ -268,7 +268,7 @@ public final class BatteryBackupHelper implements BackupHelper { // Start to restore the app optimization mode data. final int restoreCount = restoreOptimizationMode(mOptimizationModeBytes); if (restoreCount > 0) { - BatterySettingsMigrateChecker.verifyOptimizationModes(mContext); + BatterySettingsMigrateChecker.verifyBatteryOptimizeModes(mContext); } mOptimizationModeBytes = null; // clear data } diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java index 124840e1e01..3ced79034dd 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java @@ -130,7 +130,7 @@ public class BatteryOptimizeUtils { /** Return {@code true} if it is disabled for default optimized mode only. */ public boolean isDisabledForOptimizeModeOnly() { - return getAllowList(mContext).contains(mPackageName) + return getForceBatteryOptimizeModeList(mContext).contains(mPackageName) || mBatteryUtils.getPackageUid(mPackageName) == BatteryUtils.UID_NULL; } @@ -216,9 +216,9 @@ public class BatteryOptimizeUtils { || powerAllowlistBackend.isDefaultActiveApp(packageName, uid); } - static List getAllowList(Context context) { + static List getForceBatteryOptimizeModeList(Context context) { return Arrays.asList(context.getResources().getStringArray( - R.array.config_disable_optimization_mode_apps)); + R.array.config_force_battery_optimize_mode_apps)); } private static void setAppUsageStateInternal( diff --git a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java index 8697e438888..dac2abfec24 100644 --- a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java +++ b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java @@ -50,17 +50,18 @@ public final class BatterySettingsMigrateChecker extends BroadcastReceiver { static void verifyConfiguration(Context context) { context = context.getApplicationContext(); verifySaverConfiguration(context); - verifyOptimizationModes(context); + verifyBatteryOptimizeModes(context); } /** Avoid users set important apps into the unexpected battery optimize modes */ - static void verifyOptimizationModes(Context context) { + static void verifyBatteryOptimizeModes(Context context) { Log.d(TAG, "invoke verifyOptimizationModes()"); - verifyOptimizationModes(context, BatteryOptimizeUtils.getAllowList(context)); + verifyBatteryOptimizeModes(context, + BatteryOptimizeUtils.getForceBatteryOptimizeModeList(context)); } @VisibleForTesting - static void verifyOptimizationModes(Context context, List allowList) { + static void verifyBatteryOptimizeModes(Context context, List allowList) { allowList.forEach(packageName -> { final BatteryOptimizeUtils batteryOptimizeUtils = BatteryBackupHelper.newBatteryOptimizeUtils(context, packageName, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java index c34dcecce73..16b789546b8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsMigrateCheckerTest.java @@ -151,11 +151,11 @@ public final class BatterySettingsMigrateCheckerTest { } @Test - public void verifyOptimizationModes_inAllowList_resetOptimizationMode() throws Exception { + public void verifyBatteryOptimizeModes_inAllowList_resetOptimizationMode() throws Exception { doReturn(BatteryOptimizeUtils.MODE_RESTRICTED).when(mBatteryOptimizeUtils) .getAppOptimizationMode(); - mBatterySettingsMigrateChecker.verifyOptimizationModes( + mBatterySettingsMigrateChecker.verifyBatteryOptimizeModes( mContext, Arrays.asList(PACKAGE_NAME)); final InOrder inOrder = inOrder(mBatteryOptimizeUtils); @@ -166,22 +166,22 @@ public final class BatterySettingsMigrateCheckerTest { } @Test - public void verifyOptimizationModes_optimizedMode_noAction() throws Exception { + public void verifyBatteryOptimizeModes_optimizedMode_noAction() throws Exception { doReturn(BatteryOptimizeUtils.MODE_OPTIMIZED).when(mBatteryOptimizeUtils) .getAppOptimizationMode(); - mBatterySettingsMigrateChecker.verifyOptimizationModes( + mBatterySettingsMigrateChecker.verifyBatteryOptimizeModes( mContext, Arrays.asList(PACKAGE_NAME)); verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt(), any()); } @Test - public void verifyOptimizationModes_notInAllowList_noAction() throws Exception { + public void verifyBatteryOptimizeModes_notInAllowList_noAction() throws Exception { doReturn(BatteryOptimizeUtils.MODE_RESTRICTED).when(mBatteryOptimizeUtils) .getAppOptimizationMode(); - mBatterySettingsMigrateChecker.verifyOptimizationModes( + mBatterySettingsMigrateChecker.verifyBatteryOptimizeModes( mContext, new ArrayList()); verifyNoInteractions(mBatteryOptimizeUtils);