diff options
| author | 2016-10-12 14:18:27 -0700 | |
|---|---|---|
| committer | 2016-10-12 22:00:28 +0000 | |
| commit | b0449e01caf08f09e265c01c96fd7695ce124d6a (patch) | |
| tree | 8ae820eff156267d7f31a1557e3e006e13bf70ac | |
| parent | 87ff355f0a91785a44d50f8e15392781c2065f1d (diff) | |
Fixing unit issue in dis/charge time remaining parameter.
Although currently not used, the parameter is expected to be in microseconds,
not milliseconds. Hopefully this will avoid issues if the time is used in the
future.
Test: ...make sure it builds locally
Change-Id: Ie131370d3e8c8105623fc60375054f4b22cec110
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 95dd14800bf0..3d5d900e4b43 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -5433,7 +5433,8 @@ public abstract class BatteryStats implements Parcelable { if (!filtering || (flags&DUMP_CHARGED_ONLY) != 0) { if (dumpDurationSteps(pw, " ", "Discharge step durations:", getDischargeLevelStepTracker(), false)) { - long timeRemaining = computeBatteryTimeRemaining(SystemClock.elapsedRealtime()); + long timeRemaining = computeBatteryTimeRemaining( + SystemClock.elapsedRealtime() * 1000); if (timeRemaining >= 0) { pw.print(" Estimated discharge time remaining: "); TimeUtils.formatDuration(timeRemaining / 1000, pw); @@ -5449,7 +5450,8 @@ public abstract class BatteryStats implements Parcelable { } if (dumpDurationSteps(pw, " ", "Charge step durations:", getChargeLevelStepTracker(), false)) { - long timeRemaining = computeChargeTimeRemaining(SystemClock.elapsedRealtime()); + long timeRemaining = computeChargeTimeRemaining( + SystemClock.elapsedRealtime() * 1000); if (timeRemaining >= 0) { pw.print(" Estimated charge time remaining: "); TimeUtils.formatDuration(timeRemaining / 1000, pw); @@ -5612,14 +5614,14 @@ public abstract class BatteryStats implements Parcelable { if (!filtering || (flags&DUMP_CHARGED_ONLY) != 0) { dumpDurationSteps(pw, "", DISCHARGE_STEP_DATA, getDischargeLevelStepTracker(), true); String[] lineArgs = new String[1]; - long timeRemaining = computeBatteryTimeRemaining(SystemClock.elapsedRealtime()); + long timeRemaining = computeBatteryTimeRemaining(SystemClock.elapsedRealtime() * 1000); if (timeRemaining >= 0) { lineArgs[0] = Long.toString(timeRemaining); dumpLine(pw, 0 /* uid */, "i" /* category */, DISCHARGE_TIME_REMAIN_DATA, (Object[])lineArgs); } dumpDurationSteps(pw, "", CHARGE_STEP_DATA, getChargeLevelStepTracker(), true); - timeRemaining = computeChargeTimeRemaining(SystemClock.elapsedRealtime()); + timeRemaining = computeChargeTimeRemaining(SystemClock.elapsedRealtime() * 1000); if (timeRemaining >= 0) { lineArgs[0] = Long.toString(timeRemaining); dumpLine(pw, 0 /* uid */, "i" /* category */, CHARGE_TIME_REMAIN_DATA, |