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

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

Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev

parents 6c85dbae 7c6e6e92

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

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ public class BatteryUtils { 
        final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());

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

                BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE,

                BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING,

                BatteryStats.Uid.PROCESS_STATE_FOREGROUND};

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

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 = 9000;

    private static final long TIME_EXPECTED_FOREGROUND = 6500;

    private static final long TIME_EXPECTED_BACKGROUND = 6000;

    private static final long TIME_EXPECTED_ALL = 15000;

    private static final long TIME_EXPECTED_ALL = 12500;

    private static final double BATTERY_SCREEN_USAGE = 300;

    private static final double BATTERY_SYSTEM_USAGE = 600;

    private static final double BATTERY_OVERACCOUNTED_USAGE = 500;