commit 7dd7c5ceda2c51d378169541aea4d160a4a15587
author Jan Althaus <jalt@google.com> Tue May 08 15:30:04 2018 +0200
committer Jan Althaus <jalt@google.com> Tue May 08 15:30:04 2018 +0200
tree c887d9e327202ea687efa990f16a7eab1d424c76
parent 1b5e2d8b3e9694a809433ecc1b40f266eea9349d

Remove custom schema parsing in favor of Uri

This allows TextClassifier models to add support for additional protocols
after launch.

Bug: 79407639
Test: atest FrameworksCoreTests:TextClassificationManagerTest
Test: atest FrameworksCoreTests:TextClassificationTest
Test: atest CtsViewTestCases:TextClassificationManagerTest
Test: atest CtsViewTestCases:TextClassifierValueObjectsTest
Change-Id: I6781bf476f8c81d2106e2fb73b8f4629068bb0af

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