summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Millar <>2009-03-27 18:03:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-27 18:03:56 -0700
commit2a15f38ec2072141de086720a8e914c51056a69d (patch)
tree6c6be39973770ac7baf8dff569bd8b6b8e45c068
parent7ae5afc473552f59ce3991a6ea5d3853502893e3 (diff)
downloadframeworks_base-2a15f38ec2072141de086720a8e914c51056a69d.zip
frameworks_base-2a15f38ec2072141de086720a8e914c51056a69d.tar.gz
frameworks_base-2a15f38ec2072141de086720a8e914c51056a69d.tar.bz2
AI 143207: am: CL 142996 Fix bug in human readable battery stats dumping code which caused the wifi lock times to be off by an order of magnitude.
Original author: emillar Merged from: //branches/cupcake/... Automated import of CL 143207
-rw-r--r--core/java/android/os/BatteryStats.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index c72b828..b0ae0e6 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -851,11 +851,11 @@ public abstract class BatteryStats implements Parcelable {
}
if (fullWifiLockOnTime != 0 || scanWifiLockOnTime != 0) {
pw.println(prefix + " Full Wifi Lock Time: "
- + formatTime(fullWifiLockOnTime / 1000)
+ + formatTimeMs(fullWifiLockOnTime / 1000)
+ "(" + formatRatioLocked(fullWifiLockOnTime,
whichBatteryRealtime)+ ")");
pw.println(prefix + " Scan Wifi Lock Time: "
- + formatTime(scanWifiLockOnTime / 1000)
+ + formatTimeMs(scanWifiLockOnTime / 1000)
+ "(" + formatRatioLocked(scanWifiLockOnTime,
whichBatteryRealtime)+ ")");
}