commit ab217abee18fa9a67e274f59ee5f8fc35345f3d1
author Geremy Condra <gcondra@google.com> Mon Jun 11 17:43:12 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 11 17:43:12 2012 -0700
tree 36214ab3b297eeba99e6e2b1c52982a06c41ab5f
parent 501fa7284ae63fe28b8f81f403f24befa7c992dd
parent 27bcac317d3e5467c42e4014f0e5ec4d6f6ab494

am 27bcac31: (-s ours) Merge "DO NOT MERGE Modify browser file origin policy."

* commit '27bcac317d3e5467c42e4014f0e5ec4d6f6ab494':
  DO NOT MERGE Modify browser file origin policy.

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 3327e4c..2369554 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -318,9 +318,6 @@
         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() {