diff options
| author | Richard Coles <torne@google.com> | 2015-03-12 12:38:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 12:38:53 +0000 |
| commit | 5c91d966d472a88b553633c714fcb3ef2bdf892f (patch) | |
| tree | 8d587b2106fa98abfd8d07561e31c2125261fa4a | |
| parent | 39c700285f45c1f2396135159d376a1694713dfe (diff) | |
| parent | 0de964c432318947188f61a7b80963c70a787d9b (diff) | |
| download | Browser-5c91d966d472a88b553633c714fcb3ef2bdf892f.tar.gz | |
am 0de964c4: Merge "browser: set security state even if user disable security alerts"
* commit '0de964c432318947188f61a7b80963c70a787d9b':
browser: set security state even if user disable security alerts
| -rw-r--r-- | src/com/android/browser/Tab.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index 9734137f..dc1944e3 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -565,6 +565,7 @@ class Tab implements PictureListener { .show(); } else { handler.proceed(); + handleProceededAfterSslError(error); } } |