diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-04 23:21:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-04 23:21:14 +0000 |
| commit | d6869ba5df57989445e7e806b808ddf87f1c6bd4 (patch) | |
| tree | b389082557b2953f79f0b116b0ef207ea1331d97 | |
| parent | 6b64325fa8070f55857932da23809e2f0fe88b9d (diff) | |
| parent | a2cba9ec0e8324c9ffd5d1d8cbb6d1901eec6d53 (diff) | |
| download | minikin-android13-d4-s1-release.tar.gz | |
Snap for 9137459 from a2cba9ec0e8324c9ffd5d1d8cbb6d1901eec6d53 to tm-d4-releaseandroid-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Change-Id: I8aefd213b3ad02d4eada1369231552df7ac5b7ef
| -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'; |