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/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index 72ac37b..0a7e90c 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -34,7 +34,7 @@
"(?i)" + // switch on case insensitive matching
"(" + // begin group for schema
"(?:http|https|file):\\/\\/" +
- "|(?:inline|data|about|content|javascript):" +
+ "|(?:inline|data|about|javascript):" +
")" +
"(.*)" );