commit 4380e7311ea7733070a19128f6d469af80e7c3b0
author Greg Kaiser <gkaiser@google.com> Tue Oct 25 16:07:20 2022 +0000
committer Greg Kaiser <gkaiser@google.com> Tue Oct 25 16:07:20 2022 +0000
tree 40177578d78ff5373db057f511985666a03fe56c
parent 3fb8ceccd801ae66838a9f4a26462d5d6c7941c5

Revert "Fix result does not get correct locale tag."

This reverts commit 3fb8ceccd801ae66838a9f4a26462d5d6c7941c5.

Reason for revert: b/255559017
Test: Local build with this reverted keeps SUW from crashing

Change-Id: Ie744f48bb4f565b6a6681fdf7d814ece43ec5537

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 516eef0..bd2be12 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7842,7 +7842,7 @@
                 if (!localeFromDefaultSim.getCountry().isEmpty()) {
                     if (DBG) log("Using locale from subId: " + subId + " locale: "
                             + localeFromDefaultSim);
-                    return matchLocaleFromSupportedLocaleList(phone, localeFromDefaultSim);
+                    return matchLocaleFromSupportedLocaleList(localeFromDefaultSim);
                 } else {
                     simLanguage = localeFromDefaultSim.getLanguage();
                 }
@@ -7855,7 +7855,7 @@
             final Locale mccLocale = LocaleUtils.getLocaleFromMcc(mApp, mcc, simLanguage);
             if (mccLocale != null) {
                 if (DBG) log("No locale from SIM, using mcc locale:" + mccLocale);
-                return matchLocaleFromSupportedLocaleList(phone, localeFromDefaultSim);
+                return matchLocaleFromSupportedLocaleList(mccLocale);
             }
 
             if (DBG) log("No locale found - returning null");
@@ -7866,9 +7866,9 @@
     }
 
     @VisibleForTesting
-    String matchLocaleFromSupportedLocaleList(Phone phone, @NonNull Locale inputLocale) {
+    String matchLocaleFromSupportedLocaleList(@NonNull Locale inputLocale) {
         String[] supportedLocale = com.android.internal.app.LocalePicker.getSupportedLocales(
-                phone.getContext());
+                getDefaultPhone().getContext());
         for (String localeTag : supportedLocale) {
             if (LocaleList.matchesLanguageAndScript(
                     inputLocale, Locale.forLanguageTag(localeTag))