Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 290c6c1d: am 7b8ce2fa: Merge "Log SslErrors from captive portal sign in app." into mnc-dev

Browse Source 
* commit '290c6c1d0df2a11f95cf464fcd95c5f361a4422d':
  Log SslErrors from captive portal sign in app.
This commit is contained in:
Paul Jensen
2015-06-09 17:31:54 +00:00
committed by Android Git Automerger
parent fd90ede337 290c6c1d0d
commit 20661796e1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -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));