summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/BrowserFrame.java
diff options
context:
space:
mode:
authorHuahui Wu <hwu@google.com>2011-06-28 10:10:07 -0700
committerHuahui Wu <hwu@google.com>2011-06-28 10:10:07 -0700
commit2e029c67a8e893e91600df989bbb42272d82af21 (patch)
tree9ba5b24136d7c1318a648a9144a723493ecd5b34 /core/java/android/webkit/BrowserFrame.java
parent3015516a4611db23ce56ae057d281c9328cfdf24 (diff)
downloadframeworks_base-2e029c67a8e893e91600df989bbb42272d82af21.zip
frameworks_base-2e029c67a8e893e91600df989bbb42272d82af21.tar.gz
frameworks_base-2e029c67a8e893e91600df989bbb42272d82af21.tar.bz2
Revert "Gets the URL that has a cert error and carrys it in SslError."
This reverts commit 3015516a4611db23ce56ae057d281c9328cfdf24.
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
-rw-r--r--core/java/android/webkit/BrowserFrame.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index 79a5aff..2f4774f 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -1150,12 +1150,11 @@ class BrowserFrame extends Handler {
* {@link #nativeSslCertErrorProceed(int)} or
* {@link #nativeSslCertErrorCancel(int, int)}.
*/
- private void reportSslCertError(
- final int handle, final int cert_error, byte cert_der[], String url) {
+ private void reportSslCertError(final int handle, final int cert_error, byte cert_der[]) {
final SslError ssl_error;
try {
X509Certificate cert = new X509CertImpl(cert_der);
- ssl_error = new SslError(cert_error, cert, url);
+ ssl_error = new SslError(cert_error, cert);
} catch (IOException e) {
// Can't get the certificate, not much to do.
Log.e(LOGTAG, "Can't get the certificate from WebKit, canceling");