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

Commit 8614c6e2 authored Apr 07, 2022 by Hui Yu Committed by Android (Google) Code Review Apr 07, 2022

Merge changes from topic "presubmit-am-28eaceeb106d4ecb9a115fcdbff92b92" into tm-mainline-prod

* changes:
  [automerge] Null check on BroadcastRecord's receivers list. 2p: fc32f968
  Null check on BroadcastRecord's receivers list.

parents f3cfda4b 72476a70

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)) {