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

Commit dd67ffa6 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-team Robot
Browse files

Fix crash in the Alarm Manager service 

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

Fixes: 64881210
Test: manual

Change-Id: Iaf0b5a5e765ac4802df87083edf629a8cd9a90cd
(cherry picked from commit db9ae421)
parent 54605ff0

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

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ class AlarmManagerService extends SystemService { 


        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);

                }

            }