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),
