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

Commit a93801fd 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 

am: 4e4f0926

Change-Id: I23913c8c911c646b20b91b4b0e937261c6a28863
parents 15214bbe 4e4f0926

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;