Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d257c1a2 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

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

parents 6fcafbe5 d71e8d8c

src/com/android/settings/fuelgauge/BatteryUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ public class BatteryUtils { 
            return true;

        }



        return isSystemUid(uid) || powerWhitelistBackend.isSysWhitelistedExceptIdle(packageNames)

        return isSystemUid(uid) || powerWhitelistBackend.isWhitelisted(packageNames)

                || (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames));

    }

tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java

+8 −0
Original line number Diff line number Diff line
@@ -611,6 +611,14 @@ public class BatteryUtilsTest { 
        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

    public void testShouldHideAnomaly_normalApp_returnFalse() {

        doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class AnomalyDetectionJobServiceTest { 
    @Test

    public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() {

        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,

                mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,