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

Commit 4e4f0926 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Fix WTF in PendingIntentRecord.unregisterCancelListenerLocked()" into pi-dev 

am: 16fb9664

Change-Id: I5308791dfb3a8fc7138e4dc3af0acef308d5010e
parents a4940ae0 16fb9664

services/core/java/com/android/server/am/PendingIntentRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ final class PendingIntentRecord extends IIntentSender.Stub { 
    }



    public void unregisterCancelListenerLocked(IResultReceiver receiver) {

        if (mCancelCallbacks == null) {

            return; // Already unregistered or detached.

        }

        mCancelCallbacks.unregister(receiver);

        if (mCancelCallbacks.getRegisteredCallbackCount() <= 0) {

            mCancelCallbacks = null;