commit 9b43ce0c98ce9f865d6db547529d098c8982ccc2
author Lorenzo Colitti <lorenzo@google.com> Sun Nov 22 22:00:08 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Nov 24 13:47:14 2015 +0900
tree 49d5a69876950ea89c9fc945dab3650cdebceea0
parent 0fe13b1f7001f5e2f23062a97140784258f3423e

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

If a direct listener alarm attempts to match a regular
PendingIntent alarm, it will attempt to fetch the binder of the
regular alarm's direct listener, which is null, and crash the
system with an NPE.

Bug: 25823676
Change-Id: I85fb98b43436930a2513274dc5ab408f7d41d97f

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

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index f9d9950..d721fa1 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -2167,7 +2167,7 @@
         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) {