commit e826e6902db8a156cc81ae1fb9e900c0c5561613
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 13 07:57:30 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 13 07:57:30 2022 +0000
tree 5cf6c3f529a27282e651796711771108f99bbdc0
parent a31ee73e346ebe24afbc9683e33444a013e7d9de
parent 215b93c38f9d871cf1675c1dc156126ac604e0b7

Snap for 9170954 from 215b93c38f9d871cf1675c1dc156126ac604e0b7 to qt-aml-tzdata-release

Change-Id: Ia58ae4c216e02beef7663c083a48826914c4da2a

libs/minikin/LocaleListCache.cpp

diff --git a/libs/minikin/LocaleListCache.cpp b/libs/minikin/LocaleListCache.cpp
index c191ea6..ec47145 100644
--- a/libs/minikin/LocaleListCache.cpp
+++ b/libs/minikin/LocaleListCache.cpp
@@ -42,7 +42,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';
@@ -59,7 +59,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';
@@ -68,7 +68,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';