From aaad5deb32e3818cc67859996ac872a0d7a394a0 Mon Sep 17 00:00:00 2001 From: Wang Han Date: Thu, 18 Feb 2021 05:04:55 +0000 Subject: [PATCH] Add a missing NULL check for postActivityStartTokenRemoval() * filter.receiverList.app can actually be null here. Don't pass a null ProcessRecord to postActivityStartTokenRemoval(). Change-Id: I923f424fcb05b3956bf14728e9d0c0e48666294d --- services/core/java/com/android/server/am/BroadcastQueue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index a2eea1348d5c1..b7ecddced0c82 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -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); } }