diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 12 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 7 |
2 files changed, 3 insertions, 16 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d77168fa0f7f..add4f03cddb1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1613,7 +1613,8 @@ public class TelephonyManager { * @hide */ public String getNetworkCountryIso(int subId) { - return getNetworkCountryIsoForPhone(getPhoneId(subId)); + int phoneId = SubscriptionManager.getPhoneId(subId); + return getNetworkCountryIsoForPhone(phoneId); } /** @@ -1628,14 +1629,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getNetworkCountryIsoForPhone(int phoneId) { - try { - ITelephony telephony = getITelephony(); - if (telephony != null) - return ""; - return telephony.getNetworkCountryIsoForPhone(phoneId); - } catch (RemoteException ex) { - return ""; - } + return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); } /** Network type is unknown */ diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 1493fe2b8664..63e7abf8ec04 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -377,13 +377,6 @@ interface ITelephony { Bundle getCellLocation(String callingPkg); /** - * Returns the ISO country code equivalent of the current registered - * operator's MCC (Mobile Country Code). - * @see android.telephony.TelephonyManager#getNetworkCountryIso - */ - String getNetworkCountryIsoForPhone(int phoneId); - - /** * Returns the neighboring cell information of the device. */ List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg); |