Fix problems with determining when to kill apps for wake usage.

Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index a0a3bdf..95f217f 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -23,6 +23,7 @@
 import android.util.Log;
 import android.util.Printer;
 import android.util.SparseArray;
+import android.util.TimeUtils;
 
 /**
  * A class providing access to battery usage statistics, including information on
@@ -1576,8 +1577,10 @@
                             Uid.Proc.ExcessiveWake ew = ps.getExcessiveWake(e);
                             if (ew != null) {
                                 pw.print(prefix); pw.print("      * Killed for wake lock use: ");
-                                        pw.print(ew.usedTime); pw.print("ms over ");
-                                        pw.print(ew.overTime); pw.print("ms (");
+                                        TimeUtils.formatDuration(ew.usedTime, pw);
+                                        pw.print(" over ");
+                                        TimeUtils.formatDuration(ew.overTime, pw);
+                                        pw.print(" (");
                                         pw.print((ew.usedTime*100)/ew.overTime);
                                         pw.println("%)");
                             }