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

Commit 8cbb6e97 authored Apr 07, 2022 by Hui Yu Committed by Automerger Merge Worker Apr 07, 2022

Merge changes from topic "presubmit-am-28eaceeb106d4ecb9a115fcdbff92b92" into...

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

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

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

parents bd8397aa 8614c6e2

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -580,6 +580,11 @@ public class BroadcastDispatcher {
	// ----------------------------------		// ----------------------------------
	// BroadcastQueue operation support		// BroadcastQueue operation support
	void enqueueOrderedBroadcastLocked(BroadcastRecord r) {		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())) {		if (Intent.ACTION_LOCKED_BOOT_COMPLETED.equals(r.intent.getAction())) {
	// Create one BroadcastRecord for each UID that can be deferred.		// Create one BroadcastRecord for each UID that can be deferred.
	final SparseArray<BroadcastRecord> deferred =		final SparseArray<BroadcastRecord> deferred =

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

+4 −0

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

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

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