1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index a013a9b2d03a..4f2830bee90b 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -252,6 +252,13 @@ class CallbackProxy extends Handler {
         // 32-bit reads and writes.
         switch (msg.what) {
             case PAGE_STARTED:
+                // every time we start a new page, we want to reset the
+                // WebView certificate:
+                // if the new site is secure, we will reload it and get a
+                // new certificate set;
+                // if the new site is not secure, the certificate must be
+                // null, and that will be the case
+                mWebView.setCertificate(null);
                 if (mWebViewClient != null) {
                     mWebViewClient.onPageStarted(mWebView,
                             msg.getData().getString("url"),