Commit 693e4b14 authored May 09, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 09, 2023

Merge "Ignore demoteFromRunning requests if the process queue is not active."...

Merge "Ignore demoteFromRunning requests if the process queue is not active." into udc-dev am: 29fd4cf2

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

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

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1151,6 +1151,11 @@ class BroadcastQueueModernImpl extends BroadcastQueue {
		*/
		@GuardedBy("mService")
		private void demoteFromRunningLocked(@NonNull BroadcastProcessQueue queue) {
		if (!queue.isActive()) {
		logw("Ignoring demoteFromRunning; no active broadcast for " + queue);
		return;
		}

		final int cookie = traceBegin("demoteFromRunning");
		// We've drained running broadcasts; maybe move back to runnable
		queue.makeActiveIdle();