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

Commit d71e8d8c authored by Lei Yu's avatar Lei Yu
Browse files

Use user doze whitelist in anomaly detection 

Bug: 77924141
Test: RunSettingsRoboTests
Change-Id: Id9503c9468292f128b76ea872d6603c49965d919
parent 99902e1f

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

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,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
@@ -623,6 +623,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
@@ -131,7 +131,7 @@ public class AnomalyDetectionJobServiceTest { 
    @Test

    public void testSaveAnomalyToDatabase_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,