commit aae19fb90c9af3be4b0ef956940b7ef8afc37b0f
author Steve Block <steveblock@google.com> Wed Sep 28 02:45:28 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 28 02:45:28 2011 -0700
tree 4883a57bd8ad2a5b214fda5cf01a5568ca800a4f
parent d0e8fb431ac9c1fcc2f5b0eba884d29fc57a4cf1
parent d9151bf1ccd9bc726ba2c252919503f8968649cc

Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"

core/java/android/webkit/SslCertLookupTable.java

diff --git a/core/java/android/webkit/SslCertLookupTable.java b/core/java/android/webkit/SslCertLookupTable.java
index 048a3cf..052244f 100644
--- a/core/java/android/webkit/SslCertLookupTable.java
+++ b/core/java/android/webkit/SslCertLookupTable.java
@@ -46,4 +46,8 @@
     public boolean isAllowed(SslError sslError) {
         return table.getBoolean(sslError.toString());
     }
+
+    public void clear() {
+        table.clear();
+    }
 }

core/java/android/webkit/WebViewCore.java

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 470e843..deaf0f2 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1349,8 +1349,14 @@
                         }
 
                         case CLEAR_SSL_PREF_TABLE:
-                            Network.getInstance(mContext)
-                                    .clearUserSslPrefTable();
+                            if (JniUtil.useChromiumHttpStack()) {
+                                // FIXME: This will not work for connections currently in use, as
+                                // they cache the certificate responses. See http://b/5324235.
+                                SslCertLookupTable.getInstance().clear();
+                                nativeCloseIdleConnections();
+                            } else {
+                                Network.getInstance(mContext).clearUserSslPrefTable();
+                            }
                             break;
 
                         case TOUCH_UP: