diff options
| author | jackqdyulei <jackqdyulei@google.com> | 2017-06-22 10:24:27 -0700 |
|---|---|---|
| committer | jackqdyulei <jackqdyulei@google.com> | 2017-06-23 11:02:54 -0700 |
| commit | 3d93fc16f4e735eea3d3749d46c52a5f9ca2b938 (patch) | |
| tree | 9656a1a5993a2f7c6c5ef450984862a6c96e30ba /src/com/android/settings/fuelgauge/BatteryUtils.java | |
| parent | f6e125b46d02a6d1fae7c41abe50fb77c47748bd (diff) | |
| download | packages_apps_Settings-3d93fc16f4e735eea3d3749d46c52a5f9ca2b938.tar.gz packages_apps_Settings-3d93fc16f4e735eea3d3749d46c52a5f9ca2b938.tar.bz2 packages_apps_Settings-3d93fc16f4e735eea3d3749d46c52a5f9ca2b938.zip | |
Change the method to get foreground time.
This cl changes it to:
foregroundTime = MIN(topTime, foregroundActivityTime);
Bug: 62884954
Test: RunSettingsRoboTests
Change-Id: I236c18b19c4f06c5a6d018bc06ffb9862af51de2
Diffstat (limited to 'src/com/android/settings/fuelgauge/BatteryUtils.java')
| -rw-r--r-- | src/com/android/settings/fuelgauge/BatteryUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 64039ef77f..4abc1b192e 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -45,6 +45,7 @@ import java.util.List; */ public class BatteryUtils { public static final int UID_NULL = -1; + @Retention(RetentionPolicy.SOURCE) @IntDef({StatusType.FOREGROUND, StatusType.BACKGROUND, @@ -171,7 +172,9 @@ public class BatteryUtils { for (int i = 0, size = sippers.size(); i < size; i++) { final BatteryStats.Uid uid = sippers.get(i).uidObj; if (uid != null) { - final long timeMs = getForegroundActivityTotalTimeMs(uid, rawRealtimeMs); + final long timeMs = Math.min(getForegroundActivityTotalTimeMs(uid, rawRealtimeMs), + getProcessTimeMs(StatusType.FOREGROUND, uid, + BatteryStats.STATS_SINCE_CHARGED)); activityTimeArray.put(uid.getUid(), timeMs); totalActivityTimeMs += timeMs; } @@ -248,7 +251,6 @@ public class BatteryUtils { * @return the package name. If there are multiple packages related to * given id, return the first one. Or return null if there are no known * packages with the given id - * * @see PackageManager#getPackagesForUid(int) */ public String getPackageName(int uid) { |