From 33d29888120c6e96b06a6dc0edac3336022dc510 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Wed, 16 Dec 2020 12:45:34 +0000
Subject: [PATCH] Replace Locale#adjustLanguageCode with its own implementation

No known behavior change.

Bug: 154796679
Test: treehugger
Merged-In: I474ad621b84da9f7cc7961def6d6751925577d41
Change-Id: I474ad621b84da9f7cc7961def6d6751925577d41
---
 .../android/content/res/ResourcesImpl.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index c16006a6a6191..477ffeff7e754 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -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;
     }
 
     /**