[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
diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
index 24080fe..af16edb 100644
--- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
@@ -263,9 +263,7 @@
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<ApplicationInfo> getInstalledApplications() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
index aa1caf9..5ac8553 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 @@
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 @@
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 @@
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<String> 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);