Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a111

am: 9d57855c96 Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
2017-06-29 00:53:14 +00:00
parent 77a58c7b8c 9d57855c96
commit 985aa11e1a
2 changed files with 7 additions and 5 deletions
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -331,8 +331,8 @@ public class BatteryUtils {
    long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
        final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
        if (timer != null) {
-            return convertUsToMs(
-                    timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));
+            return convertUsToMs(timer.getTotalTimeLocked(convertMsToUs(rawRealtimeMs),
+                            BatteryStats.STATS_SINCE_CHARGED));
        }

        return 0;