commit db9ae4217def4f06b552e61b09c153976862658a
author Christopher Tate <ctate@google.com> Mon Aug 21 11:24:30 2017 -0700
committer Chris Tate <ctate@android.com> Mon Aug 21 19:01:00 2017 +0000
tree 3de69a63feb9e4e0c8340be6f62cfc49dd8b85c0
parent 9c85d966cd93b3943bddfd734ba0dfee37b72261

Fix crash in the Alarm Manager service

Revert the previous change that introduced an unguarded .equals()
invocation.

Fixes: 64881210
Test: manual

Change-Id: Iaf0b5a5e765ac4802df87083edf629a8cd9a90cd

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 bfa10f2..d1cf025 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -2964,7 +2964,7 @@
 
         private InFlight removeLocked(PendingIntent pi, Intent intent) {
             for (int i = 0; i < mInFlight.size(); i++) {
-                if (mInFlight.get(i).mPendingIntent.equals(pi)) {
+                if (mInFlight.get(i).mPendingIntent == pi) {
                     return mInFlight.remove(i);
                 }
             }