diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-04 17:46:16 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-04 17:46:16 +0000 |
| commit | 51f3a3879480d238f1c27dc24b78c10e699aafd7 (patch) | |
| tree | b389082557b2953f79f0b116b0ef207ea1331d97 | |
| parent | 5b471d1f68dee043629d29d3c7674498857fb386 (diff) | |
| parent | c9d471a8f418e8c25d65a6919c799681b7d5e725 (diff) | |
| download | minikin-android13-mainline-permission-release.tar.gz | |
Snap for 9256364 from c9d471a8f418e8c25d65a6919c799681b7d5e725 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010android13-mainline-permission-release
Change-Id: I9024e4af907a951ce0e91dfda0bb529bf5cb0c2d
| -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'; |