diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-06-09 17:19:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 17:19:43 +0000 |
| commit | 290c6c1d0df2a11f95cf464fcd95c5f361a4422d (patch) | |
| tree | c0a7884543a82ab0fad646675726feafdb6dd4aa /packages/CaptivePortalLogin | |
| parent | 79a4cb7b18f92d9a6adf774818ac7dfe9d8b8cad (diff) | |
| parent | 7b8ce2fa0e237c2a740f4648c5046d12b4c84f9b (diff) | |
| download | frameworks_base-290c6c1d0df2a11f95cf464fcd95c5f361a4422d.zip frameworks_base-290c6c1d0df2a11f95cf464fcd95c5f361a4422d.tar.gz frameworks_base-290c6c1d0df2a11f95cf464fcd95c5f361a4422d.tar.bz2 | |
am 7b8ce2fa: Merge "Log SslErrors from captive portal sign in app." into mnc-dev
* commit '7b8ce2fa0e237c2a740f4648c5046d12b4c84f9b':
Log SslErrors from captive portal sign in app.
Diffstat (limited to 'packages/CaptivePortalLogin')
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index d00f850..ddbcd78 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -336,7 +336,10 @@ public class CaptivePortalLoginActivity extends Activity { @Override public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { - Log.w(TAG, "SSL error; displaying SSL warning."); + Log.w(TAG, "SSL error (error: " + error.getPrimaryError() + " host: " + + // Only show host to avoid leaking private info. + Uri.parse(error.getUrl()).getHost() + " certificate: " + + error.getCertificate() + "); displaying SSL warning."); final String html = String.format(SSL_ERROR_HTML, getString(R.string.ssl_error_warning), getString(R.string.ssl_error_example), mBrowserBailOutToken, getString(R.string.ssl_error_continue)); |