commit 12c4c0e45b12be18005f0ad2af2433e34dcb1a9f
author John Reck <jreck@android.com> Tue Jun 25 22:28:02 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 25 22:28:02 2013 +0000
tree 81cf5ed73ad4e480698a9756d726e9197a8f5033
parent 3e7d0344399ac2f607fddde32c1a5e54228a38f9
parent dae43b16a79a27067f032c69569868af88294220

Merge "Fix deadlock of WebViewCoreThread"

core/java/android/webkit/CallbackProxy.java

diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index a326da2..c3c5103 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -305,7 +305,12 @@
         // 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");