commit 2c403d647189b661c36e1c23a67167c4b2e44fc8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 10 16:21:33 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 10 16:21:33 2022 +0000
tree b389082557b2953f79f0b116b0ef207ea1331d97
parent 63438e24011d2201e85e17089f51af37dbc50a2b
parent c9d471a8f418e8c25d65a6919c799681b7d5e725

Snap for 9157479 from c9d471a8f418e8c25d65a6919c799681b7d5e725 to mainline-tzdata4-release

Change-Id: Ife0880b40b61cfd8c6c08403ddd5ca7b8626345a

libs/minikin/LocaleListCache.cpp

diff --git a/libs/minikin/LocaleListCache.cpp b/libs/minikin/LocaleListCache.cpp
index 38800f7..acda312 100644
--- a/libs/minikin/LocaleListCache.cpp
+++ b/libs/minikin/LocaleListCache.cpp
@@ -43,7 +43,7 @@
     size_t outLength = 0;
     UErrorCode uErr = U_ZERO_ERROR;
     outLength = uloc_canonicalize(localeString.c_str(), output, outSize, &uErr);
-    if (U_FAILURE(uErr)) {
+    if (U_FAILURE(uErr) || (uErr == U_STRING_NOT_TERMINATED_WARNING)) {
         // unable to build a proper locale identifier
         ALOGD("uloc_canonicalize(\"%s\") failed: %s", localeString.c_str(), u_errorName(uErr));
         output[0] = '\0';
@@ -63,7 +63,7 @@
     char likelyChars[ULOC_FULLNAME_CAPACITY];
     uErr = U_ZERO_ERROR;
     uloc_addLikelySubtags(output, likelyChars, ULOC_FULLNAME_CAPACITY, &uErr);
-    if (U_FAILURE(uErr)) {
+    if (U_FAILURE(uErr) || (uErr == U_STRING_NOT_TERMINATED_WARNING)) {
         // unable to build a proper locale identifier
         ALOGD("uloc_addLikelySubtags(\"%s\") failed: %s", output, u_errorName(uErr));
         output[0] = '\0';
@@ -72,7 +72,7 @@
 
     uErr = U_ZERO_ERROR;
     outLength = uloc_toLanguageTag(likelyChars, output, outSize, false, &uErr);
-    if (U_FAILURE(uErr)) {
+    if (U_FAILURE(uErr) || (uErr == U_STRING_NOT_TERMINATED_WARNING)) {
         // unable to build a proper locale identifier
         ALOGD("uloc_toLanguageTag(\"%s\") failed: %s", likelyChars, u_errorName(uErr));
         output[0] = '\0';