From 35f567467e6eddfce8b92f05917c70e87d61d4c8 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 13 Jul 2021 13:08:54 -0700 Subject: [PATCH] Consistent reporting of failure conditions Querying for the state of the exact-alarm permission produced inconsistent results depending on circumstances. This is now fixed so the failure reporting is invariant. Bug: 193032972 Test: manual Test: atest CtsAlarmManagerTestCases Change-Id: Ie1cc126cec568b6f53ebe6049e57ed13abdfd5bb --- .../java/com/android/server/alarm/AlarmManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ed80ddbd2cd73..94f38021984bf 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -2593,7 +2593,7 @@ public class AlarmManagerService extends SystemService { final int uid = mPackageManagerInternal.getPackageUid(packageName, 0, userId); if (callingUid != uid && !UserHandle.isCore(callingUid)) { throw new SecurityException("Uid " + callingUid - + " cannot query hasScheduleExactAlarm for uid " + uid); + + " cannot query hasScheduleExactAlarm for package " + packageName); } return (uid > 0) ? hasScheduleExactAlarmInternal(packageName, uid) : false; }