ScopedIcuLocale incorrectly parses the input as locale ID

All usages of ScopedIcuLocale are in LocaleNative, CaseMapperNative,
TimeZoneNamesNative, and they provided a BCP-47 language tag
instead of ICU locale ID. ScopedIcuLocale should parse the input
as language tag.

The tests for those 3 classes are added in the prior CLs.

The bug wasn't an issue because Locale::createFromName is lenient enought
to parse language tag, espesically accepting both - and _ as the
separator. However, it's not guaranteed in the future ICU version.

No known regression is caused by this bug.

Test: CtsLibcoreTestCases
Test: CtsIcuTestCases
Change-Id: Iea107619d638e06d58623b702793959df1210e68

2 files changed, 14 insertions, 8 deletions

diff --git a/android_icu4j/libcore_bridge/src/native/ScopedIcuLocale.h b/android_icu4j/libcore_bridge/src/native/ScopedIcuLocale.h
index 851de76c6..6d707d02f 100644
--- a/android_icu4j/libcore_bridge/src/native/ScopedIcuLocale.h
+++ b/android_icu4j/libcore_bridge/src/native/ScopedIcuLocale.h
@@ -23,20 +23,26 @@
 
 class ScopedIcuLocale {
  public:
-  ScopedIcuLocale(JNIEnv* env, jstring javaLocaleName) : mEnv(env) {
+  ScopedIcuLocale(JNIEnv* env, jstring javaLanguageTag) : mEnv(env) {
     mLocale.setToBogus();
 
-    if (javaLocaleName == NULL) {
-      jniThrowNullPointerException(mEnv, "javaLocaleName == null");
+    if (javaLanguageTag == NULL) {
+      jniThrowNullPointerException(mEnv, "javaLanguageTag == null");
       return;
     }
 
-    const ScopedUtfChars localeName(env, javaLocaleName);
-    if (localeName.c_str() == NULL) {
+    const ScopedUtfChars languageTag(env, javaLanguageTag);
+    if (languageTag.c_str() == NULL) {
       return;
     }
 
-    mLocale = icu::Locale::createFromName(localeName.c_str());
+    UErrorCode err;
+    icu::Locale locale = icu::Locale::forLanguageTag(languageTag.c_str(), err);
+    if (U_FAILURE(err)) {
+      return;
+    }
+
+    mLocale = locale;
   }
 
   ~ScopedIcuLocale() {
diff --git a/android_icu4j/libcore_bridge/src/native/com_android_icu_text_TimeZoneNamesNative.cpp b/android_icu4j/libcore_bridge/src/native/com_android_icu_text_TimeZoneNamesNative.cpp
index f3e51f4f2..5b3b05c71 100644
--- a/android_icu4j/libcore_bridge/src/native/com_android_icu_text_TimeZoneNamesNative.cpp
+++ b/android_icu4j/libcore_bridge/src/native/com_android_icu_text_TimeZoneNamesNative.cpp
@@ -43,8 +43,8 @@ static bool setStringArrayElement(JNIEnv* env, jobjectArray array, int i, const
   return true;
 }
 
-static void TimeZoneNamesNative_fillZoneStringsNative(JNIEnv* env, jclass, jstring javaLocaleName, jobjectArray result) {
-  ScopedIcuLocale icuLocale(env, javaLocaleName);
+static void TimeZoneNamesNative_fillZoneStringsNative(JNIEnv* env, jclass, jstring javaLanguageTag, jobjectArray result) {
+  ScopedIcuLocale icuLocale(env, javaLanguageTag);
   if (!icuLocale.valid()) {
     return;
   }