[Android WebView] Propagate Java exceptions thrown in OnReceivedSslError

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 9d2ad2555099ee4ed200f6716c2d610426ed67ea..fd8125f886775f5f2fd3ad9b1f26da794496a0ea 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -388,12 +388,19 @@ void AwContentBrowserClient::AllowCertificateError(
   AwContentsClientBridgeBase* client =
       AwContentsClientBridgeBase::FromWebContents(web_contents);
   bool cancel_request = true;
-  if (client)
+  if (client) {
     client->AllowCertificateError(cert_error,
                                   ssl_info.cert.get(),
                                   request_url,
                                   callback,
                                   &cancel_request);
+    if (client->HasPendingJavaException()) {
+      // If there is a pending Java exception we should return out to our Java
+      // handler as quickly as possible - and avoid calling back into Java
+      // through JNI.
+      return;
+    }
+  }
   if (cancel_request)
     callback.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
 }