diff options
| author | Paul Miller <paulmiller@google.com> | 2015-04-01 22:46:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 22:46:48 +0000 |
| commit | 87dc57636cbac58ab9845260aee8a7ee951c6892 (patch) | |
| tree | b35e87509b503d60ee521346fa66d6ffea8d6ad5 | |
| parent | 5c91d966d472a88b553633c714fcb3ef2bdf892f (diff) | |
| parent | 36180ed8521a178ddf682a9cc831c072810d77ae (diff) | |
| download | Browser-87dc57636cbac58ab9845260aee8a7ee951c6892.tar.gz | |
am 36180ed8: Merge "Finish removing "inline" URI scheme"
* commit '36180ed8521a178ddf682a9cc831c072810d77ae':
Finish removing "inline" URI scheme
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/browser/UrlUtils.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6d1c822c..a90468bd 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 16b670b5..18f3c626 100644 --- 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):" + "|(?:.*:.*@)" + ")" + "(.*)" ); |