diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-09 21:34:46 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-09 21:34:46 +0000 |
| commit | c9b7a64bc7a483764370627630af8bb08fd5758a (patch) | |
| tree | b389082557b2953f79f0b116b0ef207ea1331d97 | |
| parent | 5c5cc45dd0d7a671aa35720bb4ff4f94bad8fc88 (diff) | |
| parent | c9d471a8f418e8c25d65a6919c799681b7d5e725 (diff) | |
| download | minikin-android13-mainline-mediaprovider-release.tar.gz | |
Snap for 9156129 from c9d471a8f418e8c25d65a6919c799681b7d5e725 to mainline-mediaprovider-releaseaml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080android13-mainline-mediaprovider-release
Change-Id: I932d2d4bb3c912b729ce74943db67a2a95810868
| -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'; |