am 36180ed8: Merge "Finish removing "inline" URI scheme"

* commit '36180ed8': Finish removing "inline" URI scheme

am 36180ed8: Merge "Finish removing "inline" URI scheme"
* commit '36180ed8': Finish removing "inline" URI scheme
87dc5763 · Paul Miller · Android Git Automerger · 5c91d966 · 36180ed8 · 87dc5763
Commit 87dc5763 authored 10 years ago by Paul Miller Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

AndroidManifest.xml AndroidManifest.xml +0 -1

src/com/android/browser/UrlUtils.java src/com/android/browser/UrlUtils.java +1 -1

No files found.
--- 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"/>

--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -32,7 +32,7 @@ public class UrlUtils {
            "(?i)" + // switch on case insensitive matching
            "(" +    // begin group for schema
            "(?:http|https|file):\\/\\/" +
-            "|(?:inline|data|about|javascript):" +
+            "|(?:data|about|javascript):" +
            "|(?:.*:.*@)" +
            ")" +
            "(.*)" );