Merge "Check the isInUse with the lock held in MessageQueue" into rvc-dev

2020-05-09 04:18:39 +00:00
parent 5d92729cbc baf2d6448e
commit 04dc962d1d
1 changed files with 4 additions and 3 deletions
--- a/core/java/android/os/MessageQueue.java
+++ b/core/java/android/os/MessageQueue.java
@@ -550,11 +550,12 @@ public final class MessageQueue {
        if (msg.target == null) {
            throw new IllegalArgumentException("Message must have a target.");
        }
-        if (msg.isInUse()) {
-            throw new IllegalStateException(msg + " This message is already in use.");
-        }

        synchronized (this) {
+            if (msg.isInUse()) {
+                throw new IllegalStateException(msg + " This message is already in use.");
+            }
+
            if (mQuitting) {
                IllegalStateException e = new IllegalStateException(
                        msg.target + " sending message to a Handler on a dead thread");