summaryrefslogtreecommitdiff
path: root/packages/CarrierDefaultApp
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2020-04-28 16:30:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-28 16:30:24 +0000
commitc676bb66304bbd8d00f7d8d1e0f5e272fefcc576 (patch)
treed4d453fb8cf3c8ee1b8c2053c8f39934e1ca3107 /packages/CarrierDefaultApp
parentb5ee33d74c6290112903868dc5dee74586a8eb33 (diff)
parente422c51bd31fff4de060bcf16a6452d9e88c904d (diff)
Merge "Fix WebView vulnerability by disallowing file access" am: 57c1da45bf am: e422c51bd3
Change-Id: Ic767958bff7d420989b477491751d1a91cd66699
Diffstat (limited to 'packages/CarrierDefaultApp')
-rw-r--r--packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
index 50542818e0d7..6fab9e4641b6 100644
--- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
+++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
@@ -106,6 +106,7 @@ public class CaptivePortalLoginActivity extends Activity {
webSettings.setSupportZoom(true);
webSettings.setBuiltInZoomControls(true);
webSettings.setDomStorageEnabled(true);
+ webSettings.setAllowFileAccess(false);
mWebViewClient = new MyWebViewClient();
mWebView.setWebViewClient(mWebViewClient);
mWebView.setWebChromeClient(new MyWebChromeClient());