summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorPaul Miller <paulmiller@google.com>2015-04-02 01:40:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-02 01:40:23 +0000
commit258c575ea8cac93fd33e75b2b1e9fa9d205ef254 (patch)
tree809c44528cf8af59657e2adebfff87f010f479eb /src/com/android
parent8d85e75b1424350ea459a8fc3ecddf2a0f214f3b (diff)
parent87dc57636cbac58ab9845260aee8a7ee951c6892 (diff)
downloadpackages_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
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/UrlUtils.java2
1 files changed, 1 insertions, 1 deletions
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):" +
"|(?:.*:.*@)" +
")" +
"(.*)" );