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

Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev

Browse Source
This commit is contained in:
Jack Yu
2018-04-21 01:22:51 +00:00
committed by Android (Google) Code Review
parent a6b7a6fb33 65ee3064df
commit 4755c56965
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1841,24 +1841,23 @@ public class TelephonyManager {
}
/**
* Returns the ISO country code equivalent of the current registered
* operator's MCC (Mobile Country Code).
* Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
* registered operator, or nearby cell information if not registered.
* .
* <p>
* Availability: Only when user is registered to a network. Result may be
* unreliable on CDMA networks (use {@link #getPhoneType()} to determine if
* on a CDMA network).
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
* if on a CDMA network).
*/
public String getNetworkCountryIso() {
return getNetworkCountryIsoForPhone(getPhoneId());
}
/**
* Returns the ISO country code equivalent of the current registered
* operator's MCC (Mobile Country Code) of a subscription.
* Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
* registered operator, or nearby cell information if not registered.
* <p>
* Availability: Only when user is registered to a network. Result may be
* unreliable on CDMA networks (use {@link #getPhoneType()} to determine if
* on a CDMA network).
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
* if on a CDMA network).
*
* @param subId for which Network CountryIso is returned
* @hide