commit 8cf85e8d6a9907f8698d4d774d49e04d05ee655e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 03 23:24:29 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 03 23:24:29 2022 +0000
tree ca8cbee1d7ec55ef66121eb348073d579f012271
parent f2793fbe906b787c4339cafd53f07b21d216915a
parent 903764749565739fbab458382758762af4a8c130

Snap for 9133013 from 903764749565739fbab458382758762af4a8c130 to tm-qpr2-release

Change-Id: I2ef8534096bba7d0c3f484498b727b05c499d0d0

libs/minikin/LocaleListCache.cpp

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