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

Commit 5676c67e 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 am: 693e4b14

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



Change-Id: Ie6ffe5c405f5edcab7fe977f0c0fb5125600aea2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ca74941 693e4b14

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