commit f758e59f496a7799a5464ba9a4c2e5e56a7c7141
author Selim Gurun <sgurun@google.com> Thu Mar 29 18:27:04 2012 -0700
committer Geremy Condra <gcondra@google.com> Wed Jun 06 19:55:08 2012 -0700
tree 2547c2fe926d4eaa18cffb700cb6d3bcde1918f2
parent 501fa7284ae63fe28b8f81f403f24befa7c992dd

DO NOT MERGE Modify browser file origin policy.

Bug: 6212665

Modify browser's file origin policy to match Chrome's. This is
a cherry-pick from master. sha:
   559317c0ef684a8e9a77443343ff61a263e31168

Change-Id: Idafb4f93f61d9503df6cb0d6cedcc85a00a9827b

src/com/android/browser/BrowserSettings.java

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 @@
         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() {