diff options
| author | Victor Chang <vichang@google.com> | 2021-01-19 10:16:12 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2021-11-26 11:23:56 +0000 |
| commit | 5604ac6f4f84c873098276abef5f6cd95ecdbf27 (patch) | |
| tree | 2794b21b91473c09cc7a1dd991a59033a1d75d24 | |
| parent | df3b8a03390482bd463b11764765d6e1fbb2d93c (diff) | |
| download | icu-5604ac6f4f84c873098276abef5f6cd95ecdbf27.tar.gz | |
Android patch: convrtrs.txt: JavaUnicode customizations.
This change was introduced in Android by the ICU421 and ICU4.6 upgrades:
https://android.googlesource.com/platform/external/icu/+/85bf2e2
https://android.googlesource.com/platform/external/icu/+/27f6547
(cherry picked from commit f8387513469806088e05f3807ceec1d4d2466199)
Test: n/a
Change-Id: Ic7862a82d20426578ab41c42ffb061e4dbe486e9
| -rw-r--r-- | icu4c/source/data/mappings/convrtrs.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/icu4c/source/data/mappings/convrtrs.txt b/icu4c/source/data/mappings/convrtrs.txt index add429801..76d247800 100644 --- a/icu4c/source/data/mappings/convrtrs.txt +++ b/icu4c/source/data/mappings/convrtrs.txt @@ -274,7 +274,9 @@ UTF-16LE,version=1 UnicodeLittle { JAVA* } x-UTF-16LE-BOM { JAVA } # MalformedInputException: Missing byte-order mark. # In this case, ICU4C sets a U_ILLEGAL_ESCAPE_SEQUENCE UErrorCode value # and a UCNV_ILLEGAL UConverterCallbackReason. -UTF-16,version=1 +# BEGIN Android-changed +UTF-16,version=1 JavaUnicode # alias made up to avoid java.nio.charset.IllegalCharsetNameException +# END Android-changed # This is the same as standard UTF-16 but always writes a big-endian byte stream, # regardless of the platform endianness, as expected by the Java compatibility tests. @@ -284,7 +286,9 @@ UTF-16,version=1 # # From Unicode: Write BE BOM and BE bytes # To Unicode: Detects and consumes BOM. Defaults to BE. -UTF-16,version=2 +# BEGIN Android-changed +UTF-16,version=2 JavaUnicode2 # alias made up to avoid java.nio.charset.IllegalCharsetNameException +# END Android-changed # Note: ICU does not currently support Java-specific, non-Unicode-standard UTF-32 variants. # Presumably, these behave analogously to the UTF-16 variants with similar names. |