Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8860761993c9a4b9ebb45c8d3f54d58b205926e4
This commit is contained in:
@@ -809,7 +809,8 @@ public final class BroadcastQueue {
|
||||
r.resultExtras, r.ordered, r.initialSticky, r.userId);
|
||||
// parallel broadcasts are fire-and-forget, not bookended by a call to
|
||||
// finishReceiverLocked(), so we manage their activity-start token here
|
||||
if (r.allowBackgroundActivityStarts && !r.ordered) {
|
||||
if (filter.receiverList.app != null
|
||||
&& r.allowBackgroundActivityStarts && !r.ordered) {
|
||||
postActivityStartTokenRemoval(filter.receiverList.app, r);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user