Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced29a54 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

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

* commit '52dbdbf2':
  Fix deadlock of WebViewCoreThread
parents b10804a9 52dbdbf2
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,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");