diff options
| author | Richard Coles <torne@google.com> | 2015-03-13 07:08:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 07:08:13 +0000 |
| commit | 8d85e75b1424350ea459a8fc3ecddf2a0f214f3b (patch) | |
| tree | 34fdd52de802e534228081af8bb5a36c8ed190d4 /src/com | |
| parent | 00958090a9467782cb621708bf48abcf576e6a59 (diff) | |
| parent | 5c91d966d472a88b553633c714fcb3ef2bdf892f (diff) | |
| download | packages_apps_Browser-8d85e75b1424350ea459a8fc3ecddf2a0f214f3b.zip packages_apps_Browser-8d85e75b1424350ea459a8fc3ecddf2a0f214f3b.tar.gz packages_apps_Browser-8d85e75b1424350ea459a8fc3ecddf2a0f214f3b.tar.bz2 | |
am 5c91d966: am 0de964c4: Merge "browser: set security state even if user disable security alerts"
* commit '5c91d966d472a88b553633c714fcb3ef2bdf892f':
browser: set security state even if user disable security alerts
Diffstat (limited to 'src/com')
| -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 9734137..dc1944e 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); } } |