commit cf38ed9abb82ad32acf82624858d1657ada0ba4c
author Nathan Harold <nharold@google.com> Tue Apr 21 19:31:10 2020 -0700
committer Nathan Harold <nharold@google.com> Fri Apr 24 10:19:19 2020 -0700
tree 9f5a65bae9cfd78c8bdfdfba8419f04859362cac
parent 8dc53ad9f0b224997c8a6e4d8cc0875b83be6195

Remove IWLAN exemption from getNetworkCountryIsoForPhone

Remove the IWLAN special case from getNetworkCountryIsoForPhone.
LocaleTracker now works regardless of IWLAN support, so this check
was simply preventing the ISO from being retrieved even when in
another country and with a valid emergency cell ID from WWAN.

Bug: 148111627
Test: manual
Merged-In: I3d815d510457155214104782f6ab73a387e94647
Change-Id: I3d815d510457155214104782f6ab73a387e94647
(cherry picked from commit 532f51c1db7fc359e53abbbd684013547a4ffbc9)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3f41dfb..360c2cd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2295,29 +2295,15 @@
                 phoneId = SubscriptionManager.DEFAULT_PHONE_INDEX;
             }
             final int subId = mSubscriptionController.getSubIdUsingPhoneId(phoneId);
-            // Todo: fix this when we can get the actual cellular network info when the device
-            // is on IWLAN.
-            if (TelephonyManager.NETWORK_TYPE_IWLAN
-                    == getVoiceNetworkTypeForSubscriber(subId, mApp.getPackageName(),
-                    null)) {
-                return "";
-            }
             Phone phone = PhoneFactory.getPhone(phoneId);
-            if (phone != null) {
-                ServiceStateTracker sst = phone.getServiceStateTracker();
-                EmergencyNumberTracker emergencyNumberTracker = phone.getEmergencyNumberTracker();
-                if (sst != null) {
-                    LocaleTracker lt = sst.getLocaleTracker();
-                    if (lt != null) {
-                        if (!TextUtils.isEmpty(lt.getCurrentCountry())) {
-                            return lt.getCurrentCountry();
-                        } else if (emergencyNumberTracker != null) {
-                            return emergencyNumberTracker.getEmergencyCountryIso();
-                        }
-                    }
-                }
-            }
-            return "";
+            if (phone == null) return "";
+            ServiceStateTracker sst = phone.getServiceStateTracker();
+            if (sst == null) return "";
+            LocaleTracker lt = sst.getLocaleTracker();
+            if (lt == null) return "";
+            if (!TextUtils.isEmpty(lt.getCurrentCountry())) return lt.getCurrentCountry();
+            EmergencyNumberTracker ent = phone.getEmergencyNumberTracker();
+            return (ent == null) ? "" : ent.getEmergencyCountryIso();
         } finally {
             Binder.restoreCallingIdentity(identity);
         }