Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca

am: 7f97be01f5

Change-Id: I5c8cf44658007f6366d497c09f1cfba10a49da48
This commit is contained in:
Jack Yu
2018-04-24 17:43:18 -07:00
committed by android-build-merger

View File

@@ -1877,7 +1877,7 @@ public class TelephonyManager {
/**
* Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
* registered operator, or nearby cell information if not registered.
* registered operator or the cell nearby, if available.
* .
* <p>
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
@@ -1889,7 +1889,7 @@ public class TelephonyManager {
/**
* Returns the ISO country code equivalent of the MCC (Mobile Country Code) of the current
* registered operator, or nearby cell information if not registered.
* registered operator or the cell nearby, if available.
* <p>
* Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
* if on a CDMA network).