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

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

am e242111c: Merge "Remove copy of Locale.adjustLanguageCode." 

* commit 'e242111c':
  Remove copy of Locale.adjustLanguageCode.
parents b7bb95b0 e242111c

core/java/android/content/res/Resources.java

+1 −9
Original line number Diff line number Diff line
@@ -1680,15 +1680,7 @@ public class Resources { 
            remainder = languageTag.substring(separator);

        }



        if ("id".equals(language)) {

            return "in" + remainder;

        } else if ("yi".equals(language)) {

            return "ji" + remainder;

        } else if ("he".equals(language)) {

            return "iw" + remainder;

        } else {

            return languageTag;

        }

        return Locale.adjustLanguageCode(language) + remainder;

    }



    /**