Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4e94c8b authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a am: 1c691ff7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5ce8805a0d414a60958a83978dca5ce2598dd64
parents e7280d82 1c691ff7

services/core/java/com/android/server/am/BroadcastQueue.java

+2 −1
Original line number Diff line number Diff line
@@ -812,7 +812,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);

                }

            }