diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-05 11:36:48 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-01-12 12:42:51 -0500 |
| commit | d1737edc13864b2304763167720b27b68791e25a (patch) | |
| tree | a8ffee765e4e944007ca241bfec281c486c2a5f6 /core/java/android/webkit/FrameLoader.java | |
| parent | 31d9d895d79977fa4e6dff2491b209fbeb21c61b (diff) | |
| download | frameworks_base-d1737edc13864b2304763167720b27b68791e25a.zip frameworks_base-d1737edc13864b2304763167720b27b68791e25a.tar.gz frameworks_base-d1737edc13864b2304763167720b27b68791e25a.tar.bz2 | |
Do not merge.
Cherry picked:
Add an api to toggle content url access.
By default, WebView allows access to content providers on the system. This
setting allows applications to turn off content urls.
Bug: 1196879
Change-Id: I49eaea6d7b9ccc3b3a4443d712222556087568c0
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
| -rw-r--r-- | core/java/android/webkit/FrameLoader.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java index 2b44775..0d80302 100644 --- a/core/java/android/webkit/FrameLoader.java +++ b/core/java/android/webkit/FrameLoader.java @@ -203,7 +203,8 @@ class FrameLoader { settings.getAllowFileAccess())).sendToTarget(); } return true; - } else if (URLUtil.isContentUrl(url)) { + } else if (settings.getAllowContentAccess() && + URLUtil.isContentUrl(url)) { // Send the raw url to the ContentLoader because it will do a // permission check and the url has to match. if (loadListener.isSynchronous()) { |