PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle " into sc-v2-dev am: c4f761c079

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048454

Change-Id: Iaa9b0143b6dfc96aba4fd83982f2ebeb0c2bd575
This commit is contained in:
YUKAI HUNG
2021-10-14 09:56:48 +00:00
committed by Automerger Merge Worker
parent 6001f86910 c4f761c079
commit 3d0d6a38aa
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/BatteryBackupHelper.java
View File

@@ -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<ApplicationInfo> getInstalledApplications() {

20
tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
View File

@@ -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<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);