commit | 0de964c432318947188f61a7b80963c70a787d9b | [log] [tgz] |
---|---|---|
author | Richard Coles <torne@google.com> | Thu Mar 12 12:29:29 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 12 12:29:30 2015 +0000 |
tree | dca2398555080eeb6af2ef6be79ce40c7c72431e | |
parent | 4ecb2d7127ec7568c53a12132199baf13b2804b4 [diff] | |
parent | 41482a1ac69f8677eb5e93210492fd0e974c54b4 [diff] |
Merge "browser: set security state even if user disable security alerts"
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index 9734137..dc1944e 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java
@@ -565,6 +565,7 @@ .show(); } else { handler.proceed(); + handleProceededAfterSslError(error); } }