From 1476d32b87d85885838fb066bcca48f1df9750b6 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 5 May 2016 14:46:15 -0700 Subject: [PATCH] Add the individual wakeup alarm counts to the batterystats checkin. Bug: 28601365 Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d --- core/java/android/os/BatteryStats.java | 6 +++++- .../java/com/android/server/am/BatteryStatsService.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index a4bd8eb32dc46..ea5ae32e8244b 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 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 serviceStats = ps.getServiceStats(); for (int isvc=serviceStats.size()-1; isvc>=0; isvc--) { diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 79b141345f93f..6deebc0ce679d 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -1091,7 +1091,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub pw.println(" [--daily] [--reset] [--write] [--new-daily] [--read-daily] [-h] []"); pw.println(" --checkin: generate output for a checkin report; will write (and clear) the"); pw.println(" last old completed stats when they had been reset."); - pw.println(" --c: write the current stats in checkin format."); + pw.println(" -c: write the current stats in checkin format."); pw.println(" --history: show only history data."); pw.println(" --history-start : show only history data starting at given time offset."); pw.println(" --charged: only output data since last charged.");