Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for bug 5100096 Repeated Security Waring"

Browse Source
This commit is contained in:
Kristian Monsen
2011-09-07 09:56:50 -07:00
committed by Android (Google) Code Review
parent 01dba603d7 9041d9254e
commit 727e6ba5df
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/BrowserFrame.java
View File

@@ -43,6 +43,7 @@ import junit.framework.Assert;
import java.io.IOException;
import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.Charsets;
import java.security.PrivateKey;
@@ -1171,7 +1172,8 @@ class BrowserFrame extends Handler {
X509Certificate cert = new X509CertImpl(cert_der);
SslCertificate sslCert = new SslCertificate(cert);
if (JniUtil.useChromiumHttpStack()) {
ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert, url);
ssl_error = SslError.SslErrorFromChromiumErrorCode(cert_error, sslCert,
new URL(url).getHost());
} else {
ssl_error = new SslError(cert_error, cert, url);
}