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

Commit abecca9c authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Part of fix for bug 4997380: Some error types unknown to SslError"

parents ecfeebeb 0d6c6a73

core/java/android/webkit/BrowserFrame.java

+6 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,12 @@ class BrowserFrame extends Handler { 
        final SslError ssl_error;

        try {

            X509Certificate cert = new X509CertImpl(cert_der);

            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");