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

Change-Id: I7c46a81556e274e84123a071e36b54daf2a09ef3

1 files changed, 6 insertions, 2 deletions

diff --git a/icu4c/source/data/mappings/convrtrs.txt b/icu4c/source/data/mappings/convrtrs.txt
index 17aaef987..7758fff10 100644
--- a/icu4c/source/data/mappings/convrtrs.txt
+++ b/icu4c/source/data/mappings/convrtrs.txt
@@ -272,7 +272,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.
@@ -282,7 +284,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.