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

Commit 3fbd1201 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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: Icccdc5b5d5e74cca253fa72ca77c405229d749d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ee6d8c0 29fd4cf2

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