From 7903aba3ca30cda4abceb8f516f11064fe0da939 Mon Sep 17 00:00:00 2001 From: Siyamed Sinir Date: Mon, 11 Apr 2016 18:38:28 -0700 Subject: [PATCH] Fix Patterns.UCS_CHAR character class Wrap Patterns.UCS_CHAR character class with brackets. Previously CL Ie6df818dc4d33dfee6ee54432a2231cca51ec423 broke autoLink email and URL patterns while excluding the empty spaces. Bug: 28020781 Change-Id: Ieb7d09cb5e544c1e7cbc1a4d665b979c65e7e773 --- core/java/android/util/Patterns.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/util/Patterns.java b/core/java/android/util/Patterns.java index df91525b0a217..0a452dbc39a16 100644 --- a/core/java/android/util/Patterns.java +++ b/core/java/android/util/Patterns.java @@ -253,7 +253,7 @@ public class Patterns { /** * Valid UCS characters defined in RFC 3987. Excludes space characters. */ - private static final String UCS_CHAR = + private static final String UCS_CHAR = "[" + "\u00A0-\uD7FF" + "\uF900-\uFDCF" + "\uFDF0-\uFFEF" + @@ -271,7 +271,7 @@ public class Patterns { "\uDAC0\uDC00-\uDAFF\uDFFD" + "\uDB00\uDC00-\uDB3F\uDFFD" + "\uDB44\uDC00-\uDB7F\uDFFD" + - "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]"; + "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]"; /** * Valid characters for IRI label defined in RFC 3987.