diff options
| author | Paul Miller <paulmiller@google.com> | 2015-04-02 01:40:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-02 01:40:23 +0000 |
| commit | 258c575ea8cac93fd33e75b2b1e9fa9d205ef254 (patch) | |
| tree | 809c44528cf8af59657e2adebfff87f010f479eb | |
| parent | 8d85e75b1424350ea459a8fc3ecddf2a0f214f3b (diff) | |
| parent | 87dc57636cbac58ab9845260aee8a7ee951c6892 (diff) | |
| download | packages_apps_Browser-258c575ea8cac93fd33e75b2b1e9fa9d205ef254.zip packages_apps_Browser-258c575ea8cac93fd33e75b2b1e9fa9d205ef254.tar.gz packages_apps_Browser-258c575ea8cac93fd33e75b2b1e9fa9d205ef254.tar.bz2 | |
am 87dc5763: am 36180ed8: Merge "Finish removing "inline" URI scheme"
* commit '87dc57636cbac58ab9845260aee8a7ee951c6892':
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 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 @@ public class UrlUtils { "(?i)" + // switch on case insensitive matching "(" + // begin group for schema "(?:http|https|file):\\/\\/" + - "|(?:inline|data|about|javascript):" + + "|(?:data|about|javascript):" + "|(?:.*:.*@)" + ")" + "(.*)" ); |