commit 75628b7ddc2a51289fd865f0ea716d401042f38b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 03 00:47:45 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 03 00:47:45 2022 +0000
tree 4354e9890cf67fa6d36f4c5529eca4b1206ccb95
parent 17c2064a5c1f690e12a62da84fd0a287bdf9e5aa
parent a4c1c5cdc0d217feab6ad32e0a54f69cb917ef22

Merge "Merge TQ1A.221205.012" into stage-aosp-master

libs/minikin/LocaleListCache.cpp

diff --git a/libs/minikin/LocaleListCache.cpp b/libs/minikin/LocaleListCache.cpp
index 0baee05..acda312 100644
--- a/libs/minikin/LocaleListCache.cpp
+++ b/libs/minikin/LocaleListCache.cpp
@@ -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';