diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-13 20:24:39 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-29 20:10:21 +0100 |
| commit | 0d6c6a73c6e274ab847f7b1f648361b5e2d28f8c (patch) | |
| tree | 85abb7ae584da7c8ab95719c2549105461110848 | |
| parent | ad65b46d5f6c569b588556dcf85b64d59600b175 (diff) | |
| download | frameworks_base-0d6c6a73c6e274ab847f7b1f648361b5e2d28f8c.zip frameworks_base-0d6c6a73c6e274ab847f7b1f648361b5e2d28f8c.tar.gz frameworks_base-0d6c6a73c6e274ab847f7b1f648361b5e2d28f8c.tar.bz2 | |
Part of fix for bug 4997380: Some error types unknown to SslError
Use the new SslError chromium error codes parser.
Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 738bcb9..9fbc4a7 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -1163,7 +1163,12 @@ class BrowserFrame extends Handler { final SslError ssl_error; try { X509Certificate cert = new X509CertImpl(cert_der); - ssl_error = new SslError(cert_error, cert, url); + SslCertificate sslCert = new SslCertificate(cert); + if (JniUtil.useChromiumHttpStack()) { + ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert, url); + } else { + ssl_error = new SslError(cert_error, cert, url); + } } catch (IOException e) { // Can't get the certificate, not much to do. Log.e(LOGTAG, "Can't get the certificate from WebKit, canceling"); |