diff options
| author | Xin Li <delphij@google.com> | 2022-11-29 15:18:43 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-11-29 15:18:43 -0800 |
| commit | a4c1c5cdc0d217feab6ad32e0a54f69cb917ef22 (patch) | |
| tree | 206eefcb1673137dd2b5c87db1d0872c9f3b7db7 | |
| parent | 1556498bb14b334a4503549297254734890d1070 (diff) | |
| parent | 02f6ab4780ed1ade353ea3dc973ebcedec67497f (diff) | |
| download | minikin-a4c1c5cdc0d217feab6ad32e0a54f69cb917ef22.tar.gz | |
Merge TQ1A.221205.012
Bug: 255404110
Merged-In: I651d1ff64d06b4c30e18ee69772f52a60aa5ff7a
Change-Id: Ieec60a4acac4036c28d3e654eede54240a515125
| -rw-r--r-- | libs/minikin/LocaleListCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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'; |