Merge "More work on procstats: save/restore state, fixes."

2013-06-29 02:14:10 +00:00
parent 04971a736a 904a857d5a
commit f406e23012
6 changed files with 903 additions and 356 deletions
--- 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 });
--- 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) {