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

Commit 28bb0c9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix MessageQueue race between quit and stackHasMessages" into main

parents d39891aa 931f8563

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+3 −2
Original line number Diff line number Diff line
@@ -3047,8 +3047,9 @@ public final class MessageQueue { 


        if (top.isQuittingNode()) {

            QuittingNode quittingNode = (QuittingNode) top;

            if (quittingNode.mNext.isMessageNode()) {

                top = quittingNode.mNext;

            StackNode next = quittingNode.mNext;

            if (next.isMessageNode()) {

                top = next;

            } else {

                waitForDrainCompleted();

                return false;