diff options
| author | Siyamed Sinir <siyamed@google.com> | 2016-04-12 00:35:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-12 00:35:29 +0000 |
| commit | 4b92594857ce52f96252f43c776f3ed31f0ebdfb (patch) | |
| tree | 84e58b34023b04cd527203ed5c587fa39ce7af2a /core/java/android/util/Patterns.java | |
| parent | 75a19a6fcac7b410e2ff98d11c23071ac2f6b2a1 (diff) | |
| parent | 911c2694e2b08c7a3dbb77150afcd09ff01e5ccf (diff) | |
Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
Diffstat (limited to 'core/java/android/util/Patterns.java')
| -rw-r--r-- | core/java/android/util/Patterns.java | 5 |
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. |