diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-13 07:57:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-13 07:57:30 +0000 |
| commit | e826e6902db8a156cc81ae1fb9e900c0c5561613 (patch) | |
| tree | 5cf6c3f529a27282e651796711771108f99bbdc0 | |
| parent | a31ee73e346ebe24afbc9683e33444a013e7d9de (diff) | |
| parent | 215b93c38f9d871cf1675c1dc156126ac604e0b7 (diff) | |
| download | minikin-q_tzdata_aml_297100000.tar.gz | |
Snap for 9170954 from 215b93c38f9d871cf1675c1dc156126ac604e0b7 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_297100000android10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: Ia58ae4c216e02beef7663c083a48826914c4da2a
| -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 c191ea6..ec47145 100644 --- a/libs/minikin/LocaleListCache.cpp +++ b/libs/minikin/LocaleListCache.cpp @@ -42,7 +42,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'; @@ -59,7 +59,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'; @@ -68,7 +68,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'; |