summaryrefslogtreecommitdiffstats
path: root/core/java/android/text
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-12-17 23:19:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 23:19:25 +0000
commitd946753aa4ac3ac9b16ff1627a19fb05f1608660 (patch)
tree0bf9dbd5a8abf34d8e10d10c77bf5a3688ade148 /core/java/android/text
parent28e691010f2990825c2e30ea244ba3bbac935725 (diff)
parent3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a (diff)
downloadframeworks_base-d946753aa4ac3ac9b16ff1627a19fb05f1608660.zip
frameworks_base-d946753aa4ac3ac9b16ff1627a19fb05f1608660.tar.gz
frameworks_base-d946753aa4ac3ac9b16ff1627a19fb05f1608660.tar.bz2
am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
* commit '3ac280c93bdebe4ca698e9a2e3d6d2daf3598e7a': Revert "Change Linkify leniency to VALID"
Diffstat (limited to 'core/java/android/text')
-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 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());