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

Merge "Update API docs for country ISO APIs."

Browse Source 
am: 990053e552

Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
This commit is contained in:
Tyler Gunn
2019-04-23 14:49:19 -07:00
committed by android-build-merger
parent 9bc0b85dae 990053e552
commit d60707b4ea
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2277,12 +2277,15 @@ public class TelephonyManager {
} }
/** /**
* Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current * Returns the ISO-3166 country code equivalent of the MCC (Mobile Country Code) of the current
* registered operator or the cell nearby, if available. * registered operator or the cell nearby, if available.
* . * <p>
* The ISO-3166 country code is provided in lowercase 2 character format.
* <p> * <p>
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
* if on a CDMA network). * if on a CDMA network).
* <p>
* @return the lowercase 2 character ISO-3166 country code, or empty string if not available.
*/ */
public String getNetworkCountryIso() { public String getNetworkCountryIso() {
return getNetworkCountryIsoForPhone(getPhoneId()); return getNetworkCountryIsoForPhone(getPhoneId());
@@ -3141,7 +3144,10 @@ public class TelephonyManager {
} }
/** /**
* Returns the ISO country code equivalent for the SIM provider's country code. * Returns the ISO-3166 country code equivalent for the SIM provider's country code.
* <p>
* The ISO-3166 country code is provided in lowercase 2 character format.
* @return the lowercase 2 character ISO-3166 country code, or empty string is not available.
*/ */
public String getSimCountryIso() { public String getSimCountryIso() {
return getSimCountryIsoForPhone(getPhoneId()); return getSimCountryIsoForPhone(getPhoneId());