diff options
| author | Joe Onorato <joeo@google.com> | 2016-05-05 22:11:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-05 22:11:57 +0000 |
| commit | 47384f90b4adb6dc4a005a7870e0ec6841042151 (patch) | |
| tree | 4d0209c08e77be6836532f061b4d6e359bc374dc /core/java/android | |
| parent | 9f76abc8ab9db3306c8061e9719dbe2a998031f3 (diff) | |
| parent | 1476d32b87d85885838fb066bcca48f1df9750b6 (diff) | |
Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index a4bd8eb32dc4..ea5ae32e8244 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -189,6 +189,7 @@ public abstract class BatteryStats implements Parcelable { private static final String VERSION_DATA = "vers"; private static final String UID_DATA = "uid"; + private static final String WAKEUP_ALARM_DATA = "wua"; private static final String APK_DATA = "apk"; private static final String PROCESS_DATA = "pr"; private static final String CPU_DATA = "cpu"; @@ -3251,7 +3252,10 @@ public abstract class BatteryStats implements Parcelable { int wakeups = 0; final ArrayMap<String, ? extends Counter> alarms = ps.getWakeupAlarmStats(); for (int iwa=alarms.size()-1; iwa>=0; iwa--) { - wakeups += alarms.valueAt(iwa).getCountLocked(which); + int count = alarms.valueAt(iwa).getCountLocked(which); + wakeups += count; + String name = alarms.keyAt(iwa).replace(',', '_'); + dumpLine(pw, uid, category, WAKEUP_ALARM_DATA, name, count); } final ArrayMap<String, ? extends Uid.Pkg.Serv> serviceStats = ps.getServiceStats(); for (int isvc=serviceStats.size()-1; isvc>=0; isvc--) { |