PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove STATE_TOP_SLEEPING from foreground time

Browse Source 
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
This commit is contained in:
jackqdyulei
2017-04-24 11:37:00 -07:00
parent 9e89d528f6
commit 7c6e6e9254
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -102,7 +102,6 @@ public class BatteryUtils {
final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime()); final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());
final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP, final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP,
BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE, BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE,
BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING,
BatteryStats.Uid.PROCESS_STATE_FOREGROUND}; BatteryStats.Uid.PROCESS_STATE_FOREGROUND};
Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid())); Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid()));

4
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
View File

@@ -63,9 +63,9 @@ public class BatteryUtilsTest {
private static final long TIME_STATE_BACKGROUND = 6000 * UNIT; private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
private static final int UID = 123; 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_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_SCREEN_USAGE = 300;
private static final double BATTERY_SYSTEM_USAGE = 600; private static final double BATTERY_SYSTEM_USAGE = 600;
private static final double BATTERY_OVERACCOUNTED_USAGE = 500; private static final double BATTERY_OVERACCOUNTED_USAGE = 500;