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

Commit 651261c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev

parents 2dcbda80 01e690e3

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

+1 −3
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ public class BatteryUtils { 


    private long getProcessForegroundTimeMs(BatteryStats.Uid uid, int which) {

        final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());

        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP,

                BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE,

                BatteryStats.Uid.PROCESS_STATE_FOREGROUND};

        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP};

        Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid()));



        long timeUs = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class AdvancedPowerUsageDetailTest { 
        doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(

                eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());

        doReturn(FOREGROUND_TIME_US).when(mUid).getProcessStateTime(

                eq(BatteryStats.Uid.PROCESS_STATE_FOREGROUND), anyLong(), anyInt());

                eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());

        ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);

        mBatteryEntry.iconId = ICON_ID;

        mBatterySipper.uidObj = mUid;

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

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ public class BatteryUtilsTest { 
    private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;



    private static final int UID = 123;

    private static final long TIME_EXPECTED_FOREGROUND = 6500;

    private static final long TIME_EXPECTED_FOREGROUND = 1500;

    private static final long TIME_EXPECTED_BACKGROUND = 6000;

    private static final long TIME_EXPECTED_ALL = 12500;

    private static final long TIME_EXPECTED_ALL = 7500;

    private static final double BATTERY_SCREEN_USAGE = 300;

    private static final double BATTERY_SYSTEM_USAGE = 600;

    private static final double BATTERY_OVERACCOUNTED_USAGE = 500;