diff options
author | Xin Li <delphij@google.com> | 2020-08-27 10:16:51 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:51 -0700 |
commit | ecde83a0b44e8fe353c43dcd9bcc84b3f3e54dae (patch) | |
tree | 5fb4bf4c5aef4a63ffbf47da46e4e12bf6ab4233 | |
parent | 57dfe7ec9782e2f4c44fd3db23abd7c01a215e67 (diff) | |
parent | d53a288bbfb27a4d8aea24c87af5f8fc056cd844 (diff) | |
download | HTMLViewer-ecde83a0b44e8fe353c43dcd9bcc84b3f3e54dae.tar.gz |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I46de99eddcff6f2866919a6d807236b6bd80416c
Change-Id: Ia2ee8ddd83d8fdc6c583e501892b413de094ed0b
-rw-r--r-- | OWNERS | 1 | ||||
-rw-r--r-- | src/com/android/htmlviewer/HTMLViewerActivity.java | 1 |
2 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,3 @@ # Default code reviewers picked from top 3 or more developers. # Please update this list if you find better candidates. davidln@google.com -paulmiller@google.com 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. |