Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4abcd5c6 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "Switch TextUtils over to new ICU API." into lmp-dev

parents 691ed056 31e6b144

core/java/android/text/TextUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1750,7 +1750,7 @@ public class TextUtils { 
     */

    public static int getLayoutDirectionFromLocale(Locale locale) {

        if (locale != null && !locale.equals(Locale.ROOT)) {

            final String scriptSubtag = ICU.getScript(ICU.addLikelySubtags(locale.toString()));

            final String scriptSubtag = ICU.addLikelySubtags(locale).getScript();

            if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);



            if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||