| commit | 05141df15af6eec281dc2970383101cd483d384d | [log] [tgz] |
|---|---|---|
| author | Sehee Park <sehee32.park@samsung.com> | Wed Feb 13 21:08:16 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 13 21:08:16 2019 -0800 |
| tree | 4759511f275823bc1d9d2c1609a44b0a89fce586 | |
| parent | ef50734c58eaa8f3a8a4a52f6168a5eb1f21a3e6 [diff] | |
| parent | f27ea45a901fa91cccacbcf2fc6dfa662c874cbb [diff] |
Merge "Enable DOM storage API for CaptivePortalLoginActivity" am: f7150486bf am: 7042e290cf am: f27ea45a90 Change-Id: Ie07ab945aa6a5c997f776f237f757c533cc1d453
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index ce627ce..a288d010 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -175,6 +175,7 @@ webSettings.setSupportZoom(true); webSettings.setBuiltInZoomControls(true); webSettings.setDisplayZoomControls(false); + webSettings.setDomStorageEnabled(true); mWebViewClient = new MyWebViewClient(); webview.setWebViewClient(mWebViewClient); webview.setWebChromeClient(new MyWebChromeClient());
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java index f36b4aa..55c9361 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -106,6 +106,7 @@ webSettings.setLoadWithOverviewMode(true); webSettings.setSupportZoom(true); webSettings.setBuiltInZoomControls(true); + webSettings.setDomStorageEnabled(true); mWebViewClient = new MyWebViewClient(); mWebView.setWebViewClient(mWebViewClient); mWebView.setWebChromeClient(new MyWebChromeClient());