diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-04 23:22:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-04 23:22:04 +0000 |
| commit | b465e1f8985e82d6cd380ae965575add3a6c2ec9 (patch) | |
| tree | b389082557b2953f79f0b116b0ef207ea1331d97 | |
| parent | 8cf85e8d6a9907f8698d4d774d49e04d05ee655e (diff) | |
| parent | a2cba9ec0e8324c9ffd5d1d8cbb6d1901eec6d53 (diff) | |
| download | minikin-android13-qpr2-s11-release.tar.gz | |
Snap for 9137459 from a2cba9ec0e8324c9ffd5d1d8cbb6d1901eec6d53 to tm-qpr2-releaseandroid-13.0.0_r49android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-release
Change-Id: I199b075f0c2d94a8de9bde38805e08d7b0a0530c
| -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'; |