summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2016-10-24 02:13:15 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-24 02:13:15 +0000
commitc9f79b3d1eed248a7cc64ee818d8cec577117b4d (patch)
treeafa2313761d2b5f3f591b946a117ed7aa73f4044
parent0f106f5744c3a68de393120d3a9a8ff396646e3f (diff)
parent625166377b2d7c5f09d1e7617b3eac3a464fba53 (diff)
CaptivePortalLogin: set mixed content policy to compatibility.
am: 625166377b Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
-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());