summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fuelgauge/BatteryUtils.java
diff options
context:
space:
mode:
authorjackqdyulei <jackqdyulei@google.com>2017-06-27 15:59:35 -0700
committerjackqdyulei <jackqdyulei@google.com>2017-06-27 16:49:14 -0700
commit118e2baabeea05a80883c03fb01ea07eb2071e11 (patch)
tree83e873d0755ed77522ef9cd4f0891c7ed5518899 /src/com/android/settings/fuelgauge/BatteryUtils.java
parent38b7d50a4921b1a96b2a1bbd54c615b95f1dbaff (diff)
downloadpackages_apps_Settings-118e2baabeea05a80883c03fb01ea07eb2071e11.tar.gz
packages_apps_Settings-118e2baabeea05a80883c03fb01ea07eb2071e11.tar.bz2
packages_apps_Settings-118e2baabeea05a80883c03fb01ea07eb2071e11.zip
Fix the getForegroundActivityTotalTimeMs
It should return milliseconds, not microseconds time Bug: 63073847 Test: RunSettingsRoboTests Change-Id: Ib7ddb947646062fc50a40d300829389e0ac401ee
Diffstat (limited to 'src/com/android/settings/fuelgauge/BatteryUtils.java')
-rw-r--r--src/com/android/settings/fuelgauge/BatteryUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 4abc1b192e..b5f94fc821 100644
--- 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;