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

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

Merge "Fix for bug 5100096 Repeated Security Waring"

parents 01dba603 9041d925

core/java/android/webkit/BrowserFrame.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ import junit.framework.Assert; 
import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;

import java.net.URL;

import java.net.URLEncoder;

import java.net.URLEncoder;

import java.nio.charset.Charsets;

import java.nio.charset.Charsets;

import java.security.PrivateKey;

import java.security.PrivateKey;
@@ -1171,7 +1172,8 @@ class BrowserFrame extends Handler { 
            X509Certificate cert = new X509CertImpl(cert_der);

            X509Certificate cert = new X509CertImpl(cert_der);

            SslCertificate sslCert = new SslCertificate(cert);

            SslCertificate sslCert = new SslCertificate(cert);

            if (JniUtil.useChromiumHttpStack()) {

            if (JniUtil.useChromiumHttpStack()) {

                ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert, url);

                ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert,

                        new URL(url).getHost());

            } else {

            } else {

                ssl_error = new SslError(cert_error, cert, url);

                ssl_error = new SslError(cert_error, cert, url);

            }

            }