Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""

Browse Source 
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593
This commit is contained in:
Jonathan Basseri
2017-08-02 01:58:18 +00:00
committed by android-build-merger
parent 02cc8151a6 85a215bae7
commit 7728849a39
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1628,7 +1628,8 @@ public class TelephonyManager {
* @hide
*/
public String getNetworkCountryIso(int subId) {
return getNetworkCountryIsoForPhone(getPhoneId(subId));
int phoneId = SubscriptionManager.getPhoneId(subId);
return getNetworkCountryIsoForPhone(phoneId);
}
/**
@@ -1643,14 +1644,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 */

7
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -376,13 +376,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.
*/