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
Change-Id: I3d815d510457155214104782f6ab73a387e94647
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fb177e1..d265e6b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2314,29 +2314,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(),
- mApp.getAttributionTag())) {
- 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);
}