Merge "Add documentation in TelephonyManager#getNetworkCountryIso"

2019-08-05 20:17:53 +00:00
parent 2bfe37de04 597c6bad06
commit 753f6c3e5a
1 changed files with 4 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2327,6 +2327,10 @@ public class TelephonyManager {
     * <p>
     * The ISO-3166 country code is provided in lowercase 2 character format.
     * <p>
+     * Note: In multi-sim, this returns a shared emergency network country iso from other
+     * subscription if the subscription used to create the TelephonyManager doesn't camp on
+     * a network due to some reason (e.g. pin/puk locked), or sim is absent in the corresponding
+     * slot.
     * Note: Result may be unreliable on CDMA networks (use {@link #getPhoneType()} to determine
     * if on a CDMA network).
     * <p>