diff options
| author | John Reck <jreck@android.com> | 2013-06-25 22:28:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-25 22:28:02 +0000 |
| commit | 12c4c0e45b12be18005f0ad2af2433e34dcb1a9f (patch) | |
| tree | 81cf5ed73ad4e480698a9756d726e9197a8f5033 /core/java/android/webkit | |
| parent | 3e7d0344399ac2f607fddde32c1a5e54228a38f9 (diff) | |
| parent | dae43b16a79a27067f032c69569868af88294220 (diff) | |
| download | frameworks_base-12c4c0e45b12be18005f0ad2af2433e34dcb1a9f.zip frameworks_base-12c4c0e45b12be18005f0ad2af2433e34dcb1a9f.tar.gz frameworks_base-12c4c0e45b12be18005f0ad2af2433e34dcb1a9f.tar.bz2 | |
Merge "Fix deadlock of WebViewCoreThread"
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ 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"); |