Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev am: e5fa4cd4b5
am: 1bc54ae5eb
Change-Id: I065332475ad70ef81367e37b608e1c18f358d6d6
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index c8af4a0..e126099 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -102,7 +102,6 @@
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 52cfe4c..bfc2861 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -64,9 +64,9 @@
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;