diff options
| author | Xin Li <delphij@google.com> | 2022-12-09 10:29:36 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-12-09 10:29:36 -0800 |
| commit | ffc2592f4fe664acc26a0663636311477b5e0a3b (patch) | |
| tree | 4354e9890cf67fa6d36f4c5529eca4b1206ccb95 | |
| parent | 35a6ffe9a6763d0fb4fafa2ad5380be3d5b2d535 (diff) | |
| parent | 75628b7ddc2a51289fd865f0ea716d401042f38b (diff) | |
| download | minikin-ffc2592f4fe664acc26a0663636311477b5e0a3b.tar.gz | |
Merge Android 13 QPR1main-16k-with-phones
Bug: 261731544
Merged-In: If4cf0f0e773371430539cde914bcc761b26acf7e
Change-Id: Ia8be50ae34a68d8c6af84f2ac072b2d34655d6c5
| -rw-r--r-- | libs/minikin/LocaleListCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ static size_t toLanguageTag(char* output, size_t outSize, const StringPiece& loc 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 @@ static size_t toLanguageTag(char* output, size_t outSize, const StringPiece& loc 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 @@ static size_t toLanguageTag(char* output, size_t outSize, const StringPiece& loc 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'; |