summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-12-09 00:17:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 00:17:09 +0000
commite04cfa8aa511269276c920e49685585f52b38af7 (patch)
tree986286ffc9b3ec56d00ae2b43679feb429cf9556 /core/java/android
parent3f1ef75553e75b0ceb1e53fbd1bb23b9b917588b (diff)
parent1918d0276ad502e45944bd75a187dd22021790c5 (diff)
downloadframeworks_base-e04cfa8aa511269276c920e49685585f52b38af7.zip
frameworks_base-e04cfa8aa511269276c920e49685585f52b38af7.tar.gz
frameworks_base-e04cfa8aa511269276c920e49685585f52b38af7.tar.bz2
am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
* commit '1918d0276ad502e45944bd75a187dd22021790c5': Change Linkify leniency to VALID
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/text/util/Linkify.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java
index c1341e1..14be269 100644
--- a/core/java/android/text/util/Linkify.java
+++ b/core/java/android/text/util/Linkify.java
@@ -402,7 +402,7 @@ public class Linkify {
}
boolean hasPrefix = false;
-
+
for (int i = 0; i < prefixes.length; i++) {
if (url.regionMatches(true, 0, prefixes[i], 0,
prefixes[i].length())) {
@@ -450,7 +450,7 @@ public class Linkify {
private static final void gatherTelLinks(ArrayList<LinkSpec> links, Spannable s) {
PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
Iterable<PhoneNumberMatch> matches = phoneUtil.findNumbers(s.toString(),
- Locale.getDefault().getCountry(), Leniency.POSSIBLE, Long.MAX_VALUE);
+ Locale.getDefault().getCountry(), Leniency.VALID, Long.MAX_VALUE);
for (PhoneNumberMatch match : matches) {
LinkSpec spec = new LinkSpec();
spec.url = "tel:" + PhoneNumberUtils.normalizeNumber(match.rawString());