summaryrefslogtreecommitdiff
path: root/core/java/android/util/Patterns.java
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2016-04-05 16:32:36 -0700
committerSiyamed Sinir <siyamed@google.com>2016-04-05 16:33:58 -0700
commit911c2694e2b08c7a3dbb77150afcd09ff01e5ccf (patch)
tree72eaf06d47d64e787e33199c1610d0e62cf573bc /core/java/android/util/Patterns.java
parent68a5811711de6cfe0d61473576428b0a07bd6fb0 (diff)
Exclude unicode space characters from autoLink URL patterns
Excludes the following space characters from autoLink URL patterns: \u00A0: no-break space \u2000: en quad \u2001: em quad \u2002: en space \u2003: em space \u2004: three-per-em space \u2005: four-per-em space \u2006: six-per-em space \u2007: figure space \u2008: punctuation space \u2009: thin space \u200A: hair space \u2028: line separator \u2029: paragraph separator \u202F: narrow no-break space \u3000: ideographic space Bug: 28020781 Change-Id: Ie6df818dc4d33dfee6ee54432a2231cca51ec423
Diffstat (limited to 'core/java/android/util/Patterns.java')
-rw-r--r--core/java/android/util/Patterns.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/util/Patterns.java b/core/java/android/util/Patterns.java
index 9ed485018c2d..df91525b0a21 100644
--- a/core/java/android/util/Patterns.java
+++ b/core/java/android/util/Patterns.java
@@ -251,7 +251,7 @@ public class Patterns {
+ "|[1-9][0-9]|[0-9]))");
/**
- * Valid UCS characters defined in RFC 3987.
+ * Valid UCS characters defined in RFC 3987. Excludes space characters.
*/
private static final String UCS_CHAR =
"\u00A0-\uD7FF" +
@@ -270,7 +270,8 @@ public class Patterns {
"\uDA80\uDC00-\uDABF\uDFFD" +
"\uDAC0\uDC00-\uDAFF\uDFFD" +
"\uDB00\uDC00-\uDB3F\uDFFD" +
- "\uDB44\uDC00-\uDB7F\uDFFD";
+ "\uDB44\uDC00-\uDB7F\uDFFD" +
+ "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]";
/**
* Valid characters for IRI label defined in RFC 3987.