diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-07-08 17:31:25 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2013-07-08 18:06:24 -0700 |
commit | a4cc205ee840a5374a96c9635dc5121d82a3eaf9 (patch) | |
tree | bf3b25df34d9fbb95cb204a0e873e811c74741f0 /core/java/android/os | |
parent | ef50a1a0dd9a962d1b92613399ed34058ee2098c (diff) | |
download | frameworks_base-a4cc205ee840a5374a96c9635dc5121d82a3eaf9.zip frameworks_base-a4cc205ee840a5374a96c9635dc5121d82a3eaf9.tar.gz frameworks_base-a4cc205ee840a5374a96c9635dc5121d82a3eaf9.tar.bz2 |
More procstats work.
The historical data is now a more central part of the stats.
When a checkin happens, the data is not deleted, just marked
as checked in so we can continue to access it.
The default procstats dump is now a new "summary" mode that
shows a more useful set of data for all of the running processes.
By default the current and all committed states are shown; you
use "--current" to only show the current. Use "--details" to
get the previous more detailed data (which now includes detailed
process data like the per-package data).
Also tweaked uid printing to be a little more compact.
Change-Id: I5414ea7c07134ebd5dc83f6f7b9f6e30151eda85
Diffstat (limited to 'core/java/android/os')
-rw-r--r-- | core/java/android/os/BatteryStats.java | 11 | ||||
-rw-r--r-- | core/java/android/os/UserHandle.java | 10 |
2 files changed, 15 insertions, 6 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 8e0935d..12646bd 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1803,8 +1803,8 @@ public abstract class BatteryStats implements Parcelable { for (int i=0; i<timers.size(); i++) { TimerEntry timer = timers.get(i); sb.setLength(0); - sb.append(" Wake lock #"); - sb.append(timer.mId); + sb.append(" Wake lock "); + UserHandle.formatUid(sb, timer.mId); sb.append(" "); sb.append(timer.mName); printWakeLock(sb, timer.mTimer, batteryRealtime, null, which, ": "); @@ -1822,8 +1822,11 @@ public abstract class BatteryStats implements Parcelable { } Uid u = uidStats.valueAt(iu); - - pw.println(prefix + " #" + uid + ":"); + + pw.print(prefix); + pw.print(" "); + UserHandle.formatUid(pw, uid); + pw.println(":"); boolean uidActivity = false; long mobileRxBytes = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, which); diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index d205253..6e693a4 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -168,8 +168,11 @@ public final class UserHandle implements Parcelable { if (appId >= Process.FIRST_ISOLATED_UID && appId <= Process.LAST_ISOLATED_UID) { sb.append('i'); sb.append(appId - Process.FIRST_ISOLATED_UID); - } else { + } else if (appId >= Process.FIRST_APPLICATION_UID) { sb.append('a'); + sb.append(appId - Process.FIRST_APPLICATION_UID); + } else { + sb.append('s'); sb.append(appId); } } @@ -190,8 +193,11 @@ public final class UserHandle implements Parcelable { if (appId >= Process.FIRST_ISOLATED_UID && appId <= Process.LAST_ISOLATED_UID) { pw.print('i'); pw.print(appId - Process.FIRST_ISOLATED_UID); - } else { + } else if (appId >= Process.FIRST_APPLICATION_UID) { pw.print('a'); + pw.print(appId - Process.FIRST_APPLICATION_UID); + } else { + pw.print('s'); pw.print(appId); } } |