From 9b8ab9c13afa945e53f068888c1d3980c7fb0468 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 5 May 2021 17:26:12 -0700 Subject: [PATCH] Add rtc fields to pushed alarm atoms Test: statsd_testdrive 368 10106 Bug: 177556103 Change-Id: Iaf7f04370b73118723cd2fbb08fd18b43aa70d8d --- .../java/com/android/server/alarm/AlarmManagerService.java | 2 +- .../java/com/android/server/alarm/MetricsHelper.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 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 70d0d5d18118f..b3396c5c827c7 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -1135,7 +1135,7 @@ public class AlarmManagerService extends SystemService { this(context, new Injector(context)); } - private static boolean isRtc(int type) { + static boolean isRtc(int type) { return (type == RTC || type == RTC_WAKEUP); } diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java index 2dc131c0bda9d..4e7311f102525 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java @@ -72,7 +72,8 @@ class MetricsHelper { alarmStore.getCount( a -> (a.getRequestedElapsed() > now + INDEFINITE_DELAY)), alarmStore.getCount(a -> (a.repeatInterval != 0)), - alarmStore.getCount(a -> (a.alarmClock != null)) + alarmStore.getCount(a -> (a.alarmClock != null)), + alarmStore.getCount(a -> AlarmManagerService.isRtc(a.type)) )); return StatsManager.PULL_SUCCESS; } @@ -101,7 +102,8 @@ class MetricsHelper { (a.flags & AlarmManager.FLAG_ALLOW_WHILE_IDLE) != 0, a.alarmClock != null, a.repeatInterval != 0, - reasonToStatsReason(a.mExactAllowReason)); + reasonToStatsReason(a.mExactAllowReason), + AlarmManagerService.isRtc(a.type)); } static void pushAlarmBatchDelivered(int numAlarms, int wakeups) {