summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHazem Ashmawy <hazems@google.com>2020-02-24 15:23:33 +0000
committerRichard Coles <torne@google.com>2020-02-26 17:45:25 +0000
commitd1349e757ffa9b500e086f4996cacbfa07c076a2 (patch)
treea60b8485750f368813d2da270668dd474f6f06a8
parent88e29f0499a06ec7160d2518cdcedbc149ae4d3a (diff)
downloadHTMLViewer-android11-mainline-permission-release.tar.gz
[HTMLViewer] Explicitly set WebSettings#setAllowFileAccess to trueandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100
WebSettings#setAllowFileAccess default value is changing to be off by default for Apps targetting API >= 30. This explicitly turns on this setting for the HTMLViewer app so it can load local files. Bug: 148840827 Test: N/A Change-Id: I632cec2af75e90d097e86081a6379afdbdf66162 (cherry picked from commit 57ab31bd6df1dda5c502cef163cb5a7ae3abe71f)
-rw-r--r--src/com/android/htmlviewer/HTMLViewerActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java
index 85a16aa..1aa1f68 100644
--- a/src/com/android/htmlviewer/HTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/HTMLViewerActivity.java
@@ -71,6 +71,7 @@ public class HTMLViewerActivity extends Activity {
s.setSavePassword(false);
s.setSaveFormData(false);
s.setBlockNetworkLoads(true);
+ s.setAllowFileAccess(true);
// Javascript is purposely disabled, so that nothing can be
// automatically run.