diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 21:34:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 21:34:33 -0700 |
| commit | 195dc210cb59ba3f660e31a95334fc3fa4d3ad2c (patch) | |
| tree | 674d0153feb8daf0f1dc536d451cd91824f2f10f /core/java/android | |
| parent | 621c6adcb765ab348eb0daf770d4c0eca65fd632 (diff) | |
| parent | a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2 (diff) | |
am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp
* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
Small fixes to battery stats.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 6 |
1 files changed, 3 insertions, 3 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++) { |