Commits

Stephen Smalley committed bcdd08f Merge

Merge branch 'master' into seandroid

  • Participants
  • Parent commits c86e696, 12c4c0e
  • Branches seandroid

Comments (0)

Files changed (1)

File core/java/android/webkit/CallbackProxy.java

         // 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");