summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-06-09 08:55:06 -0400
committerPaul Jensen <pauljensen@google.com>2015-06-09 08:55:06 -0400
commit41ff524a6325feb8dc9d3d64545c5f2aeb964f34 (patch)
tree40e18dfa21c24ea99ce658f6889a9bf7e1bca3ce /packages/CaptivePortalLogin
parentfd54da9b7ccf8218bb99cbbe540fd71ea411508b (diff)
downloadframeworks_base-41ff524a6325feb8dc9d3d64545c5f2aeb964f34.zip
frameworks_base-41ff524a6325feb8dc9d3d64545c5f2aeb964f34.tar.gz
frameworks_base-41ff524a6325feb8dc9d3d64545c5f2aeb964f34.tar.bz2
Log SslErrors from captive portal sign in app.
Bug:21604873 Change-Id: I0361da37039bb4f0f9d2e0dabbae4ab2ddbb05e3
Diffstat (limited to 'packages/CaptivePortalLogin')
-rw-r--r--packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java5
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));