summaryrefslogtreecommitdiff
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
commit625166377b2d7c5f09d1e7617b3eac3a464fba53 (patch)
tree6130be18890bc882036ed60d9c3ebb29428a7c94
parent3f0d75afe89f29f5352cc67e0dfdfb509bb64383 (diff)
downloadbase-625166377b2d7c5f09d1e7617b3eac3a464fba53.tar.gz
CaptivePortalLogin: set mixed content policy to compatibility.
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--packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index b58c87a5094d..bb8eb2cd0797 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/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());