summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2016-10-21 18:41:25 +0900
committerLorenzo Colitti <lorenzo@google.com>2016-10-21 18:47:57 +0900
commitaf8e22107d2f1b9850d7e6899e5ccdbd43f989a6 (patch)
tree43b29a6667ac9db21072f73025c60101a86c3142
parentb50079f6e9cf3cc58dfc5a321f2be57385eb7ca3 (diff)
downloadplatform_packages_modules_CaptivePortalLogin-nougat-mr1-release.tar.gz
platform_packages_modules_CaptivePortalLogin-nougat-mr1-release.tar.bz2
platform_packages_modules_CaptivePortalLogin-nougat-mr1-release.zip
This makes the policy for mixed HTTP/HTTPS content match Chrome. This allows us to display login pages where unimportant subresources are HTTP. Bug: 32171569 Change-Id: Ic8bc1440f1f26898ddbc0984fd1ddd2155c9588b
-rw-r--r--src/com/android/captiveportallogin/CaptivePortalLoginActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index b58c87a..bb8eb2c 100644
--- a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -115,6 +115,7 @@ public class CaptivePortalLoginActivity extends Activity {
myWebView.clearCache(true);
WebSettings webSettings = myWebView.getSettings();
webSettings.setJavaScriptEnabled(true);
+ webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
mWebViewClient = new MyWebViewClient();
myWebView.setWebViewClient(mWebViewClient);
myWebView.setWebChromeClient(new MyWebChromeClient());