From edcd193b171eeb6f82637819e82f4f528b7fc948 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 18 Sep 2020 14:31:11 -0700 Subject: [PATCH] Fix StatLogger indexing in alarm manager Test: Manually run: adb shell dumpsys alarm And check that sections under 'Alarm manager stats' and 'Alarm store stats' have non-zero values. Fixes: 168870483 Fixes: 168870482 Change-Id: I439eb871aa8ee180559c3d90ce17c1d5ab36f4aa --- .../java/com/android/server/alarm/AlarmManagerService.java | 2 +- .../java/com/android/server/alarm/BatchingAlarmStore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index a1be7cb9f7fbb..16be7e5e37321 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -252,7 +252,7 @@ public class AlarmManagerService extends SystemService { final ArrayList mAllowWhileIdleDispatches = new ArrayList(); interface Stats { - int REORDER_ALARMS_FOR_STANDBY = 1; + int REORDER_ALARMS_FOR_STANDBY = 0; } private final StatLogger mStatLogger = new StatLogger("Alarm manager stats", new String[]{ diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/BatchingAlarmStore.java b/apex/jobscheduler/service/java/com/android/server/alarm/BatchingAlarmStore.java index a08c22213c1fb..91c0c0579c690 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/BatchingAlarmStore.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/BatchingAlarmStore.java @@ -46,7 +46,7 @@ public class BatchingAlarmStore implements AlarmStore { private AlarmClockRemovalListener mAlarmClockRemovalListener; interface Stats { - int REBATCH_ALL_ALARMS = 1; + int REBATCH_ALL_ALARMS = 0; } final StatLogger mStatLogger = new StatLogger("Alarm store stats", new String[]{