summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/FrameLoader.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-01-05 11:36:48 -0500
committerPatrick Scott <phanna@android.com>2011-01-11 09:15:01 -0500
commitf0b70dcc401c22d40756359e93222f004be0d8b0 (patch)
tree0a2d0e24c6731eb3e542ebddcb7029dcaa7c4208 /core/java/android/webkit/FrameLoader.java
parentb5cfc44f054c17ae1e1a6a5c41fbde1f82430fff (diff)
downloadframeworks_base-f0b70dcc401c22d40756359e93222f004be0d8b0.zip
frameworks_base-f0b70dcc401c22d40756359e93222f004be0d8b0.tar.gz
frameworks_base-f0b70dcc401c22d40756359e93222f004be0d8b0.tar.bz2
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: Iad25e7171a57a9ff392cbb39057468d36355b153
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
-rw-r--r--core/java/android/webkit/FrameLoader.java3
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()) {