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

Commit 24f27a15 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Ignore demoteFromRunning requests if the process queue is not active." into udc-dev am: 29fd4cf2 am: 693e4b14" into udc-d1-dev-plus-aosp
parents c10d877c 5676c67e

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