commit 9f986466f45d4d114a76b3efe3b2986844d80bcd
author Siyamed Sinir <siyamed@google.com> Tue Apr 12 02:26:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 12 02:26:28 2016 +0000
tree bae3dbceac89d2eb399534e13afeb2426a006f31
parent 87c343cddc19da30df591667eda7bef4300bdb94
parent 7903aba3ca30cda4abceb8f516f11064fe0da939

Merge "Fix Patterns.UCS_CHAR character class" into nyc-dev

core/java/android/util/Patterns.java

diff --git a/core/java/android/util/Patterns.java b/core/java/android/util/Patterns.java
index df91525..0a452db 100644
--- a/core/java/android/util/Patterns.java
+++ b/core/java/android/util/Patterns.java
@@ -253,7 +253,7 @@
     /**
      * 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 @@
             "\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.