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

2023-05-09 17:41:58 +00:00
parent b7a3e01bdf 6da3c3bc0d
commit 29fd4cf2d8
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java
+++ b/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();