diff options
| author | Geremy Condra <gcondra@google.com> | 2012-06-11 16:53:52 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-11 16:53:53 -0700 |
| commit | 27bcac317d3e5467c42e4014f0e5ec4d6f6ab494 (patch) | |
| tree | 2547c2fe926d4eaa18cffb700cb6d3bcde1918f2 | |
| parent | 501fa7284ae63fe28b8f81f403f24befa7c992dd (diff) | |
| parent | f758e59f496a7799a5464ba9a4c2e5e56a7c7141 (diff) | |
| download | packages_apps_Browser-27bcac317d3e5467c42e4014f0e5ec4d6f6ab494.zip packages_apps_Browser-27bcac317d3e5467c42e4014f0e5ec4d6f6ab494.tar.gz packages_apps_Browser-27bcac317d3e5467c42e4014f0e5ec4d6f6ab494.tar.bz2 | |
Merge "DO NOT MERGE Modify browser file origin policy."
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 2369554..3327e4c 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -318,6 +318,9 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, settings.setAppCachePath(getAppCachePath()); settings.setDatabasePath(mContext.getDir("databases", 0).getPath()); settings.setGeolocationDatabasePath(mContext.getDir("geolocation", 0).getPath()); + // origin policy for file access + settings.setAllowUniversalAccessFromFileURLs(false); + settings.setAllowFileAccessFromFileURLs(false); } private void syncSharedSettings() { |