diff options
author | Raph Levien <raph@google.com> | 2014-12-17 23:21:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2014-12-17 23:21:16 +0000 |
commit | faf2190334df8196730b14a7dee4e26a7c87f04d (patch) | |
tree | 81b819e467c1916fa4a1e2cc6551989c03b343c7 | |
parent | 2e0af53de91a0ba90ea97e515ad05407f911000a (diff) | |
parent | d946753aa4ac3ac9b16ff1627a19fb05f1608660 (diff) | |
download | frameworks_base-faf2190334df8196730b14a7dee4e26a7c87f04d.zip frameworks_base-faf2190334df8196730b14a7dee4e26a7c87f04d.tar.gz frameworks_base-faf2190334df8196730b14a7dee4e26a7c87f04d.tar.bz2 |
am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
automerge: d946753
* commit 'd946753aa4ac3ac9b16ff1627a19fb05f1608660':
Revert "Change Linkify leniency to VALID"
-rw-r--r-- | core/java/android/text/util/Linkify.java | 4 |
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 14be269..c1341e1 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.VALID, Long.MAX_VALUE); + Locale.getDefault().getCountry(), Leniency.POSSIBLE, Long.MAX_VALUE); for (PhoneNumberMatch match : matches) { LinkSpec spec = new LinkSpec(); spec.url = "tel:" + PhoneNumberUtils.normalizeNumber(match.rawString()); |