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

Commit 1c691ff7 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 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8860761993c9a4b9ebb45c8d3f54d58b205926e4
parents 43ae72c0 5fea1d9a

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

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

                }

                }

            }

            }