From e66bcb43a1b08ec82739c4b35b50ca74938b3972 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 22 Nov 2021 10:58:09 -0800 Subject: [PATCH] Fix "alarms in flight?" reporting Autoboxing considered harmful: attempting to obtain a Message with a particular int value for arg1 was instead matching the supplied-Object obtainer because of it. Bug: 207352051 Test: atest FrameworksMockingServicesTests:com.android.server.alarm Test: atest com.android.server.DeviceIdleControllerTest Change-Id: I759ef29342cc64fa72f941f6f21f0909bbd2fe4b --- .../java/com/android/server/alarm/AlarmManagerService.java | 4 ++-- 1 file 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 392df732953f2..1620983c4137d 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -5142,7 +5142,7 @@ public class AlarmManagerService extends SystemService { Slog.d(TAG, "mBroadcastRefCount -> " + mBroadcastRefCount); } if (mBroadcastRefCount == 0) { - mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0).sendToTarget(); + mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0, 0).sendToTarget(); mWakeLock.release(); if (mInFlight.size() > 0) { mLog.w("Finished all dispatches with " + mInFlight.size() @@ -5314,7 +5314,7 @@ public class AlarmManagerService extends SystemService { if (mBroadcastRefCount == 0) { setWakelockWorkSource(alarm.workSource, alarm.creatorUid, alarm.statsTag, true); mWakeLock.acquire(); - mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1).sendToTarget(); + mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1, 0).sendToTarget(); } final InFlight inflight = new InFlight(AlarmManagerService.this, alarm, nowELAPSED); mInFlight.add(inflight);