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

Commit 09b62e61 authored Apr 07, 2022 by Hui Yu Committed by Automerger Merge Worker Apr 07, 2022

Merge "Null check on BroadcastRecord's receivers list." into tm-dev am: f3e8d882

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

Change-Id: Ib4c9e65b55a5eeeb164552d21ad9baec579c8c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 8a6025b4 f3e8d882

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -580,6 +580,11 @@ public class BroadcastDispatcher {
		// ----------------------------------
		// BroadcastQueue operation support
		void enqueueOrderedBroadcastLocked(BroadcastRecord r) {
		if (r.receivers == null \|\| r.receivers.isEmpty()) {
		mOrderedBroadcasts.add(r);
		return;
		}

		if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(r.intent.getAction())) {
		// Create one BroadcastRecord for each UID that can be deferred.
		final SparseArray<BroadcastRecord> deferred =

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,10 @@ final class BroadcastRecord extends Binder {
		return ret;
		}

		if (receivers == null) {
		return ret;
		}

		final String action = intent.getAction();
		if (!Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(action)
		&& !Intent.ACTION_BOOT_COMPLETED.equals(action)) {