From 7c6e6e92545228be7152a69df59232ec9cadcfa2 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 24 Apr 2017 11:37:00 -0700 Subject: [PATCH] Remove STATE_TOP_SLEEPING from foreground time That state means the time when app is on top while screen is off, we should not count it as foreground usage time. Bug: 37547898 Test: RunSettingsRoboTests Change-Id: I67e0c135d0c4b71cd667037b0d5dc7673b53607e --- src/com/android/settings/fuelgauge/BatteryUtils.java | 1 - .../src/com/android/settings/fuelgauge/BatteryUtilsTest.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 48e2421264a..4e2539f275c 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -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())); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index e5383c87ad5..dde575cdb39 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -63,9 +63,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;