From b1e10399cc62db183475e7dda65a7a31544cc9d0 Mon Sep 17 00:00:00 2001 From: YUKAI HUNG Date: Thu, 14 Oct 2021 09:34:27 +0000 Subject: [PATCH] [B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle This reverts commit 9de5fe158d1f5114c8e59ece8830c4d8d11c399b. Reason for revert: revert it too based on ag/16048452 Change-Id: I97ffcfcbc37fb4a99e66213023b95af759d1ed3e --- .../fuelgauge/BatteryBackupHelper.java | 4 +--- .../fuelgauge/BatteryBackupHelperTest.java | 20 ++----------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java index 24080fe9809..af16edbe018 100644 --- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java +++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java @@ -263,9 +263,7 @@ public final class BatteryBackupHelper implements BackupHelper { private boolean isSystemOrDefaultApp(String packageName) { final PowerAllowlistBackend powerAllowlistBackend = getPowerAllowlistBackend(); return powerAllowlistBackend.isSysAllowlisted(packageName) - || powerAllowlistBackend.isDefaultActiveApp(packageName) - // Optimize mode only for app which is in the allow list not idle app. - || powerAllowlistBackend.isAllowlistedExceptIdle(packageName); + || powerAllowlistBackend.isDefaultActiveApp(packageName); } private List getInstalledApplications() { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java index aa1caf98d29..5ac8553b91c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java @@ -114,9 +114,6 @@ public final class BatteryBackupHelperTest { mockUid(1001 /*fake uid*/, PACKAGE_NAME1); mockUid(1002 /*fake uid*/, PACKAGE_NAME2); mockUid(BatteryUtils.UID_NULL, PACKAGE_NAME3); - doReturn(false).when(mPowerAllowlistBackend).isDefaultActiveApp(anyString()); - doReturn(false).when(mPowerAllowlistBackend).isDefaultActiveApp(anyString()); - doReturn(false).when(mPowerAllowlistBackend).isAllowlistedExceptIdle(anyString()); } @After @@ -221,6 +218,7 @@ public final class BatteryBackupHelperTest { createTestingData(PACKAGE_NAME1, PACKAGE_NAME2, PACKAGE_NAME3); // Sets "com.android.testing.1" as system app. doReturn(true).when(mPowerAllowlistBackend).isSysAllowlisted(PACKAGE_NAME1); + doReturn(false).when(mPowerAllowlistBackend).isDefaultActiveApp(anyString()); mBatteryBackupHelper.backupOptimizationMode(mBackupDataOutput, allowlistedApps); @@ -236,21 +234,7 @@ public final class BatteryBackupHelperTest { createTestingData(PACKAGE_NAME1, PACKAGE_NAME2, PACKAGE_NAME3); // Sets "com.android.testing.1" as device default app. doReturn(true).when(mPowerAllowlistBackend).isDefaultActiveApp(PACKAGE_NAME1); - - mBatteryBackupHelper.backupOptimizationMode(mBackupDataOutput, allowlistedApps); - - // "com.android.testing.2" for RESTRICTED mode. - final String expectedResult = PACKAGE_NAME2 + ":1,"; - verifyBackupData(expectedResult); - } - - @Test - public void backupOptimizationMode_backupOptimizationAndIgnoreAppInTheAllowlist() - throws Exception { - final List allowlistedApps = Arrays.asList(PACKAGE_NAME1); - createTestingData(PACKAGE_NAME1, PACKAGE_NAME2, PACKAGE_NAME3); - // Sets "com.android.testing.1" in the allowlist. - doReturn(true).when(mPowerAllowlistBackend).isAllowlistedExceptIdle(PACKAGE_NAME1); + doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(anyString()); mBatteryBackupHelper.backupOptimizationMode(mBackupDataOutput, allowlistedApps);