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

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

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

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

@@ -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();