Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock of WebViewCoreThread"

Browse Source
This commit is contained in:
John Reck
2013-06-25 22:28:02 +00:00
committed by Gerrit Code Review
parent 3e7d034439 dae43b16a7
commit 12c4c0e45b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,12 @@ class CallbackProxy extends Handler {
// in the UI thread. The WebViewClient and WebChromeClient functions // in the UI thread. The WebViewClient and WebChromeClient functions
// that check for a non-null callback are ok because java ensures atomic // that check for a non-null callback are ok because java ensures atomic
// 32-bit reads and writes. // 32-bit reads and writes.
if (messagesBlocked()) return; if (messagesBlocked()) {
synchronized (this) {
notify();
}
return;
}
switch (msg.what) { switch (msg.what) {
case PAGE_STARTED: case PAGE_STARTED:
String startedUrl = msg.getData().getString("url"); String startedUrl = msg.getData().getString("url");