Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jan Althaus
2018-05-14 08:21:40 +00:00
committed by Android (Google) Code Review
parent 6db14d01c2 7dd7c5ceda
commit e3125c7e89
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/textclassifier/TextClassifierImpl.java
View File

@@ -755,14 +755,8 @@ public final class TextClassifierImpl implements TextClassifier {
@NonNull @NonNull
private static List<LabeledIntent> createForUrl(Context context, String text) { private static List<LabeledIntent> createForUrl(Context context, String text) {
final String httpPrefix = "http://"; if (Uri.parse(text).getScheme() == null) {
final String httpsPrefix = "https://"; text = "http://" + text;
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;
} }
return Arrays.asList(new LabeledIntent( return Arrays.asList(new LabeledIntent(
context.getString(com.android.internal.R.string.browse), context.getString(com.android.internal.R.string.browse),