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()"

Browse Source
This commit is contained in:
Makoto Onuki
2021-02-19 21:08:30 +00:00
committed by Gerrit Code Review
parent 2a1600625c aaad5deb32
commit 5fea1d9a01
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

@@ -809,7 +809,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);
} }
} }