Merge "Finish removing "inline" URI scheme"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d1c822..a90468b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -96,7 +96,6 @@
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="http" />
<data android:scheme="https" />
- <data android:scheme="inline" />
<data android:mimeType="text/html"/>
<data android:mimeType="text/plain"/>
<data android:mimeType="application/xhtml+xml"/>
diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index 16b670b..18f3c62 100644
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -32,7 +32,7 @@
"(?i)" + // switch on case insensitive matching
"(" + // begin group for schema
"(?:http|https|file):\\/\\/" +
- "|(?:inline|data|about|javascript):" +
+ "|(?:data|about|javascript):" +
"|(?:.*:.*@)" +
")" +
"(.*)" );