summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserSettings.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-01-05 11:38:58 -0500
committerPatrick Scott <phanna@android.com>2011-01-12 12:44:19 -0500
commitb92bbb498f1eeab477d62632c235d0a68a4f4ea2 (patch)
treeb9d569c3a6cdbbb4966c77db7b23c8a46da8a609 /src/com/android/browser/BrowserSettings.java
parentc8f04afcdfd06efe456afc395ac8cab0082499f0 (diff)
downloadpackages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.zip
packages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.tar.gz
packages_apps_browser-b92bbb498f1eeab477d62632c235d0a68a4f4ea2.tar.bz2
Do not merge.
Cherry pick: Remove content:// from the Browser. Disable content access in WebView as well. This requires a change to frameworks/base. Bug: 1196879 Change-Id: I00ca884654cbf53128f1e97389d2d8d44598e1c1
Diffstat (limited to 'src/com/android/browser/BrowserSettings.java')
-rw-r--r--src/com/android/browser/BrowserSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 7be3345..88bd78a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -281,6 +281,8 @@ public class BrowserSettings extends Observable implements OnSharedPreferenceCha
// enable smooth transition for better performance during panning or
// zooming
s.setEnableSmoothTransition(true);
+ // disable content url access
+ s.setAllowContentAccess(false);
// HTML5 API flags
s.setAppCacheEnabled(b.appCacheEnabled);