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

am: 16fb966442 Change-Id: I5308791dfb3a8fc7138e4dc3af0acef308d5010e
2018-04-25 18:04:21 -07:00
parent a4940ae0b2 16fb966442
commit 4e4f0926a9
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/PendingIntentRecord.java
+++ b/services/core/java/com/android/server/am/PendingIntentRecord.java
@@ -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;