Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-26 00:50:56 +00:00
committed by Android (Google) Code Review
parent 4620d9b3a3 8a0319aca5
commit 16fb966442
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/PendingIntentRecord.java
View File

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