am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"

* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171': Fix deadlock of WebViewCoreThread
2013-06-25 15:34:16 -07:00
parent 0cb0a37f1c 9d2b0dbf67
commit 52dbdbf2d1
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -296,7 +296,12 @@ class CallbackProxy extends Handler {
        // in the UI thread. The WebViewClient and WebChromeClient functions
        // that check for a non-null callback are ok because java ensures atomic
        // 32-bit reads and writes.
-        if (messagesBlocked()) return;
+        if (messagesBlocked()) {
+            synchronized (this) {
+                notify();
+            }
+            return;
+        }
        switch (msg.what) {
            case PAGE_STARTED:
                String startedUrl = msg.getData().getString("url");