commit 195dc210cb59ba3f660e31a95334fc3fa4d3ad2c
author Dianne Hackborn <hackbod@google.com> Thu Sep 09 21:34:33 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 09 21:34:33 2010 -0700
tree 674d0153feb8daf0f1dc536d451cd91824f2f10f
parent 621c6adcb765ab348eb0daf770d4c0eca65fd632
parent a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2

am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread

Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.

core/java/android/os/BatteryStats.java

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 32fb108..f5b1e57 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -1585,10 +1585,10 @@
                                 sb.append(ent.getKey()); sb.append(":\n");
                         sb.append(prefix); sb.append("      CPU: ");
                                 formatTime(sb, userTime); sb.append("usr + ");
-                                formatTime(sb, systemTime); sb.append("krn\n");
+                                formatTime(sb, systemTime); sb.append("krn");
                         if (starts != 0) {
-                            sb.append(prefix); sb.append("      "); sb.append(starts);
-                                    sb.append(" proc starts");
+                            sb.append("\n"); sb.append(prefix); sb.append("      ");
+                                    sb.append(starts); sb.append(" proc starts");
                         }
                         pw.println(sb.toString());
                         for (int e=0; e<numExcessive; e++) {

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 9ed3658..c669897 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -3633,7 +3633,9 @@
             }
             if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
                 Pid p = getPidStatsLocked(pid);
-                p.mWakeStart = SystemClock.elapsedRealtime();
+                if (p.mWakeStart == 0) {
+                    p.mWakeStart = SystemClock.elapsedRealtime();
+                }
             }
         }
 
@@ -3644,7 +3646,7 @@
             }
             if (pid >= 0 && type == WAKE_TYPE_PARTIAL) {
                 Pid p = mPids.get(pid);
-                if (p != null) {
+                if (p != null && p.mWakeStart != 0) {
                     p.mWakeSum += SystemClock.elapsedRealtime() - p.mWakeStart;
                     p.mWakeStart = 0;
                 }