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
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 @@
// 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);