Merge "Update API docs for country ISO APIs." am: 990053e552 (49b166a1) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -2312,12 +2312,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());
		@@ -3176,7 +3179,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());