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

Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753 am: a4e94c8b2c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac0f9a52b6a36657845b289df3a254b870d287cc
This commit is contained in:
Makoto Onuki
2021-02-19 23:38:48 +00:00
committed by Automerger Merge Worker
parent f8cc3c16d8 a4e94c8b2c
commit 8d7caa8afa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -825,7 +825,8 @@ public final class BroadcastQueue {
r.resultExtras, r.ordered, r.initialSticky, r.userId); r.resultExtras, r.ordered, r.initialSticky, r.userId);
// parallel broadcasts are fire-and-forget, not bookended by a call to // parallel broadcasts are fire-and-forget, not bookended by a call to
// finishReceiverLocked(), so we manage their activity-start token here // 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); postActivityStartTokenRemoval(filter.receiverList.app, r);
} }
} }