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

Commit 78a110c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace Locale#adjustLanguageCode with its own implementation" am: 81546d66 am: b03a4e6f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531680

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ca948bdb0c688b53f8808f7c948aa1b5363fbab
parents ccd634ec b03a4e6f

core/java/android/content/res/ResourcesImpl.java

+18 −1
Original line number Diff line number Diff line
@@ -548,7 +548,24 @@ public class ResourcesImpl { 
            remainder = languageTag.substring(separator);

        }



        return Locale.adjustLanguageCode(language) + remainder;

        // No need to convert to lower cases because the language in the return value of

        // Locale.toLanguageTag has been lower-cased.

        final String adjustedLanguage;

        switch(language) {

            case "id":

                adjustedLanguage = "in";

                break;

            case "yi":

                adjustedLanguage = "ji";

                break;

            case "he":

                adjustedLanguage = "iw";

                break;

            default:

                adjustedLanguage = language;

                break;

        }

        return adjustedLanguage + remainder;

    }



    /**