diff options
| author | 2010-09-09 21:30:52 -0700 | |
|---|---|---|
| committer | 2010-09-09 21:30:52 -0700 | |
| commit | a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2 (patch) | |
| tree | 05c9b7affa6077d803c9fb34720938f6ac9618ed | |
| parent | a71d69947d4a74730b17021b4c809d054d66c741 (diff) | |
| parent | b8071d790a32dc715c0fd6d4e7e1bbea6c8f7a02 (diff) | |
Merge "Small fixes to battery stats." into gingerbread
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 6 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 32fb108c593c..f5b1e57ca693 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1585,10 +1585,10 @@ public abstract class BatteryStats implements Parcelable { 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++) { diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index b73b78ba8960..c82fef0b450f 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -3631,7 +3631,9 @@ public final class BatteryStatsImpl extends BatteryStats { } if (pid >= 0 && type == WAKE_TYPE_PARTIAL) { Pid p = getPidStatsLocked(pid); - p.mWakeStart = SystemClock.elapsedRealtime(); + if (p.mWakeStart == 0) { + p.mWakeStart = SystemClock.elapsedRealtime(); + } } } @@ -3642,7 +3644,7 @@ public final class BatteryStatsImpl extends BatteryStats { } 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; } |