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

Commit 5fea1d9a authored by Makoto Onuki's avatar Makoto Onuki Committed by Gerrit Code Review
Browse files

Merge "Add a missing NULL check for postActivityStartTokenRemoval()"

parents 2a160062 aaad5deb

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

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

                }

            }