commit e3125c7e89284914d8402a527e73c888e35360c5
author Jan Althaus <jalt@google.com> Mon May 14 08:21:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 14 08:21:40 2018 +0000
tree a14f98949a137282baab2d9ad9cd7c8b7cb6ef40
parent 6db14d01c23810a2a98a1d249b9d98480f89a073
parent 7dd7c5ceda2c51d378169541aea4d160a4a15587

Merge "Remove custom schema parsing in favor of Uri" into pi-dev

core/java/android/view/textclassifier/TextClassifierImpl.java

diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java
index 2cf265d..6e5751a 100644
--- a/core/java/android/view/textclassifier/TextClassifierImpl.java
+++ b/core/java/android/view/textclassifier/TextClassifierImpl.java
@@ -755,14 +755,8 @@
 
         @NonNull
         private static List<LabeledIntent> createForUrl(Context context, String text) {
-            final String httpPrefix = "http://";
-            final String httpsPrefix = "https://";
-            if (text.toLowerCase().startsWith(httpPrefix)) {
-                text = httpPrefix + text.substring(httpPrefix.length());
-            } else if (text.toLowerCase().startsWith(httpsPrefix)) {
-                text = httpsPrefix + text.substring(httpsPrefix.length());
-            } else {
-                text = httpPrefix + text;
+            if (Uri.parse(text).getScheme() == null) {
+                text = "http://" + text;
             }
             return Arrays.asList(new LabeledIntent(
                     context.getString(com.android.internal.R.string.browse),