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

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

Browse Source 
am: e5fa4cd4b5

Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4
This commit is contained in:
jackqdyulei
2017-04-25 18:53:30 +00:00
committed by android-build-merger
parent ae7d423c74 e5fa4cd4b5
commit 1bc54ae5eb
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 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()));

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

@@ -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;