diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-08 12:19:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-08 12:19:43 +0000 |
| commit | 66efc35efe2b89c3b3873c9840acf27114e8f3fc (patch) | |
| tree | b389082557b2953f79f0b116b0ef207ea1331d97 | |
| parent | d7dabe92fe2d0ee505124019e0cf9a81dbc4fdde (diff) | |
| parent | c9d471a8f418e8c25d65a6919c799681b7d5e725 (diff) | |
| download | minikin-android13-mainline-media-release.tar.gz | |
Snap for 9154553 from c9d471a8f418e8c25d65a6919c799681b7d5e725 to mainline-media-releaseaml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000android13-mainline-media-release
Change-Id: Ic1150561c4573832057a5476c348ca51a77ad2a4
| -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'; |