Merge "Update API docs for country ISO APIs."

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

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.
* .
* <p>
* The ISO-3166 country code is provided in lowercase 2 character format.
* <p>
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
* if on a CDMA network).
* <p>
* @return the lowercase 2 character ISO-3166 country code, or empty string if not available.
*/
public String getNetworkCountryIso() {
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() {
return getSimCountryIsoForPhone(getPhoneId());