| commit | 911a0413019b5cdfc1f2bcf33e40745ffd527942 | [log] [tgz] |
|---|---|---|
| author | Bart Van Assche <bvanassche@google.com> | Thu Dec 01 20:51:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 01 20:51:41 2022 +0000 |
| tree | 4354e9890cf67fa6d36f4c5529eca4b1206ccb95 | |
| parent | 481c69df22c1135b0660ec1ba57d76195e4d29f1 [diff] | |
| parent | 17c2064a5c1f690e12a62da84fd0a287bdf9e5aa [diff] |
Android.bp: Introduce libminikin_defaults am: 35a6ffe9a6 am: 17c2064a5c Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2310619 Change-Id: I4409eefa712e01eda5cda4f2092ecff44875b0c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 @@ 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';