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

am: 33c9b7a111 Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
2017-06-29 00:48:47 +00:00
parent 9ff2435ebc 33c9b7a111
commit 9d57855c96
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;