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

Merge "Use user doze whitelist in anomaly detection" into pi-dev

Browse Source
This commit is contained in:
Lei Yu
2018-05-10 20:10:42 +00:00
committed by Android (Google) Code Review
parent 6fcafbe5bf d71e8d8c87
commit d257c1a2d9
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -521,7 +521,7 @@ public class BatteryUtils {
return true; return true;
} }
return isSystemUid(uid) || powerWhitelistBackend.isSysWhitelistedExceptIdle(packageNames) return isSystemUid(uid) || powerWhitelistBackend.isWhitelisted(packageNames)
|| (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames)); || (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames));
} }

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
View File

@@ -611,6 +611,14 @@ public class BatteryUtilsTest {
assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, systemUid)).isTrue(); assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, systemUid)).isTrue();
} }
@Test
public void testShouldHideAnomaly_AppInDozeList_returnTrue() {
doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(new String[]{HIGH_SDK_PACKAGE});
assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID)).isTrue();
}
@Test @Test
public void testShouldHideAnomaly_normalApp_returnFalse() { public void testShouldHideAnomaly_normalApp_returnFalse() {
doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID); doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);

2
tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
View File

@@ -148,7 +148,7 @@ public class AnomalyDetectionJobServiceTest {
@Test @Test
public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() { public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() {
doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any()); doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
doReturn(true).when(mPowerWhitelistBackend).isSysWhitelistedExceptIdle(any(String[].class)); doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(any(String[].class));
mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper, mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext, mBatteryStatsHelper,
mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy, mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,