diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2016-10-24 02:02:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-24 02:02:51 +0000 |
| commit | 9cac4568e50687e9c0f85dedb2d9ee6a36bd0ff8 (patch) | |
| tree | 6657d2c77dadf191f6e3fdde254c7477008bcb06 | |
| parent | 496d17f748b82bf9146615046ba964734ee83795 (diff) | |
| parent | 625166377b2d7c5f09d1e7617b3eac3a464fba53 (diff) | |
| download | base-9cac4568e50687e9c0f85dedb2d9ee6a36bd0ff8.tar.gz | |
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 1 |
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()); |