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

Commit 690892e9 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit 'aa1cf14150cbd656aa31d862865973ecfae76eff':
  Switch TextUtils over to new ICU API.
parents 120d65d4 4abcd5c6

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) ||