Merge "Log a bit to differentiate PendingIntent and callback alarms" into main (13d398ab) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,8 @@ class MetricsHelper {
		a.repeatInterval != 0,
		reasonToStatsReason(a.exactAllowReason),
		AlarmManagerService.isRtc(a.type),
		ActivityManager.processStateAmToProto(callerProcState));
		ActivityManager.processStateAmToProto(callerProcState),
		a.listener != null);
		}

		static void pushAlarmBatchDelivered(

+13 −4

Original line number	Diff line number	Diff line
		@@ -3482,11 +3482,20 @@ public final class AlarmManagerServiceTest {

		@Test
		public void alarmScheduledAtomPushed() {
		for (int i = 0; i < 10; i++) {
		final PendingIntent pi = getNewMockPendingIntent();
		for (int i = 0; i < 20; i++) {
		final PendingIntent pi;
		final IAlarmListener listener;
		if (i % 2 == 0) {
		pi = null;
		listener = getNewListener(() -> {});
		setTestAlarmWithListener(ELAPSED_REALTIME, mNowElapsedTest + i, listener);
		} else {
		pi = getNewMockPendingIntent();
		listener = null;
		setTestAlarm(ELAPSED_REALTIME, mNowElapsedTest + i, pi);
		}

		verify(() -> MetricsHelper.pushAlarmScheduled(argThat(a -> a.matches(pi, null)),
		verify(() -> MetricsHelper.pushAlarmScheduled(argThat(a -> a.matches(pi, listener)),
		anyInt()));
		}
		}