Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev

2017-06-28 17:49:36 +00:00
parent b365594242 118e2baabe
commit 451b7edfd7
2 changed files with 14 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -330,7 +330,8 @@ public class BatteryUtils {
    long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
        final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
        if (timer != null) {
-            return timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED);
+            return convertUsToMs(
+                    timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));
        }

        return 0;