commit 3fb8ceccd801ae66838a9f4a26462d5d6c7941c5
author tom hsu <tomhsu@google.com> Fri Oct 21 18:51:56 2022 +0800
committer Tom Hsu <tomhsu@google.com> Mon Oct 24 08:16:19 2022 +0000
tree 2dc8afcb14cb27b94b75daad6ab912c4c66ba1bc
parent d214c05fd8884369f92facb1045e5a1ccd92f9c1

Fix result does not get correct locale tag.

 - phone.getContext return a null in Cuttle fish ROM. It make the test
   result get failed. Hence mock the Context instance to avoid this
   situation.

Bug: b/254731907
Test: atest passed.
Test: Manual test passed. After FDR, check Wellcome page in SUW show
correct locale with zh-TW sim.

Change-Id: I831c425116b15814197944dc58588ec76d0c1b3a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index bd2be12..516eef0 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(localeFromDefaultSim);
+                    return matchLocaleFromSupportedLocaleList(phone, 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(mccLocale);
+                return matchLocaleFromSupportedLocaleList(phone, localeFromDefaultSim);
             }
 
             if (DBG) log("No locale found - returning null");
@@ -7866,9 +7866,9 @@
     }
 
     @VisibleForTesting
-    String matchLocaleFromSupportedLocaleList(@NonNull Locale inputLocale) {
+    String matchLocaleFromSupportedLocaleList(Phone phone, @NonNull Locale inputLocale) {
         String[] supportedLocale = com.android.internal.app.LocalePicker.getSupportedLocales(
-                getDefaultPhone().getContext());
+                phone.getContext());
         for (String localeTag : supportedLocale) {
             if (LocaleList.matchesLanguageAndScript(
                     inputLocale, Locale.forLanguageTag(localeTag))