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

Merge "Fixed the doc" into rvc-dev am: 65b857a25c am: c1d824bf24 am: 9272751f29

Browse Source 
Change-Id: I1d23c38555c1dd095821444435ab41591631251b
This commit is contained in:
TreeHugger Robot
2020-03-19 23:31:17 +00:00
committed by Automerger Merge Worker
parent 58ddfe1b26 9272751f29
commit 3535a3ff29
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2777,21 +2777,22 @@ public class TelephonyManager {
} }
/** /**
* Returns the ISO-3166 country code equivalent of the MCC (Mobile Country Code) of the current * Returns the ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) of
* registered operator or the cell nearby, if available. * the current registered operator or the cell nearby, if available.
* *
* 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> * <p>
* @return the lowercase 2 character ISO-3166 country code, or empty string if not available. * @return the lowercase 2 character ISO-3166-1 alpha-2 country code, or empty string if not
* available.
*/ */
public String getNetworkCountryIso() { public String getNetworkCountryIso() {
return getNetworkCountryIso(getSlotIndex()); return getNetworkCountryIso(getSlotIndex());
} }
/** /**
* Returns the ISO-3166 country code equivalent of the MCC (Mobile Country Code) of the current * Returns the ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) of
* registered operator or the cell nearby, if available. This is same as * the current registered operator or the cell nearby, if available. This is same as
* {@link #getNetworkCountryIso()} but allowing specifying the SIM slot index. This is used for * {@link #getNetworkCountryIso()} but allowing specifying the SIM slot index. This is used for
* accessing network country info from the SIM slot that does not have SIM inserted. * accessing network country info from the SIM slot that does not have SIM inserted.
* *
@@ -2801,7 +2802,8 @@ public class TelephonyManager {
* *
* @param slotIndex the SIM slot index to get network country ISO. * @param slotIndex the SIM slot index to get network country ISO.
* *
* @return the lowercase 2 character ISO-3166 country code, or empty string if not available. * @return the lowercase 2 character ISO-3166-1 alpha-2 country code, or empty string if not
* available.
* *
* @throws IllegalArgumentException when the slotIndex is invalid. * @throws IllegalArgumentException when the slotIndex is invalid.
* *
@@ -3756,10 +3758,11 @@ public class TelephonyManager {
} }
/** /**
* Returns the ISO-3166 country code equivalent for the SIM provider's country code. * Returns the ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.
* <p> * <p>
* The ISO-3166 country code is provided in lowercase 2 character format. * The ISO-3166-1 alpha-2 country code is provided in lowercase 2 character format.
* @return the lowercase 2 character ISO-3166 country code, or empty string is not available. * @return the lowercase 2 character ISO-3166-1 alpha-2 country code, or empty string is not
* available.
*/ */
public String getSimCountryIso() { public String getSimCountryIso() {
return getSimCountryIsoForPhone(getPhoneId()); return getSimCountryIsoForPhone(getPhoneId());
@@ -12301,7 +12304,7 @@ public class TelephonyManager {
/** /**
* The extra used with an {@link #ACTION_NETWORK_COUNTRY_CHANGED} to specify the * The extra used with an {@link #ACTION_NETWORK_COUNTRY_CHANGED} to specify the
* the country code in ISO 3166 format. * the country code in ISO-3166-1 alpha-2 format.
* <p class="note"> * <p class="note">
* Retrieve with {@link android.content.Intent#getStringExtra(String)}. * Retrieve with {@link android.content.Intent#getStringExtra(String)}.
*/ */