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

Commit 8b2de134 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am bb97753b: Merge "Switch TextUtils over to new ICU API." 

* commit 'bb97753b':
  Switch TextUtils over to new ICU API.
parents 5c4b5ede bb97753b

core/java/android/text/TextUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,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) ||