| commit | 4e4f0926a99def7e8a5bb97de2285f07db4af7d2 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Wed Apr 25 18:04:21 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 25 18:04:21 2018 -0700 |
| tree | 7f337dcc419f252dd30fb1da55831e16c79db4e6 | |
| parent | a4940ae0b2d64c4d3cba6d5a6039bdaee18323fd [diff] | |
| parent | 16fb96644273d8779879a28cfd5faa7018dc2843 [diff] |
Merge "Fix WTF in PendingIntentRecord.unregisterCancelListenerLocked()" into pi-dev am: 16fb966442 Change-Id: I5308791dfb3a8fc7138e4dc3af0acef308d5010e
diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 550c37a..483fec6 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java
@@ -219,6 +219,9 @@ } public void unregisterCancelListenerLocked(IResultReceiver receiver) { + if (mCancelCallbacks == null) { + return; // Already unregistered or detached. + } mCancelCallbacks.unregister(receiver); if (mCancelCallbacks.getRegisteredCallbackCount() <= 0) { mCancelCallbacks = null;