diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-06-29 02:14:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-29 02:14:10 +0000 |
| commit | f406e230125bc0328e80ffbc2ede92e61affe733 (patch) | |
| tree | 600877a6e778d5ce77680ce080814234af810b2c /core/java | |
| parent | 04971a736ae742e6593afa3537e2676b067ac46d (diff) | |
| parent | 904a857d5a319e32d1df065b38e3191324b35b0f (diff) | |
Merge "More work on procstats: save/restore state, fixes."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 6f75f7f83a29..5fa874bedf72 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -2205,6 +2205,8 @@ public class ActivityManager { pw.println(); dumpService(pw, fd, "procstats", new String[] { packageName }); pw.println(); + dumpService(pw, fd, "usagestats", new String[] { "--packages", packageName }); + pw.println(); dumpService(pw, fd, "package", new String[] { packageName }); pw.println(); dumpService(pw, fd, BatteryStats.SERVICE_NAME, new String[] { packageName }); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 061bf17455a7..e0a154cea29a 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -613,7 +613,6 @@ public final class BatteryStatsImpl extends BatteryStats { * Constructs from a parcel. * @param type * @param unpluggables - * @param powerType * @param in */ Timer(int type, ArrayList<Unpluggable> unpluggables, Parcel in) { |