Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3c1650 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Don't crash when canceling alarms if a direct listener is present"

parents 9a24b9f1 9b43ce0c

services/core/java/com/android/server/AlarmManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2251,7 +2251,7 @@ class AlarmManagerService extends SystemService { 
        public boolean matches(PendingIntent pi, IAlarmListener rec) {

            return (operation != null)

                    ? operation.equals(pi)

                    : listener.asBinder().equals(rec.asBinder());

                    : rec != null && listener.asBinder().equals(rec.asBinder());

        }



        public boolean matches(String packageName) {