Merge "Add documentation in TelephonyManager#getNetworkCountryIso" into qt-r1-dev

am: cd4208e080 Change-Id: I8caa8b5ee1fd070020551bbb7035c4904f98f284
2019-08-02 15:08:53 -07:00
parent 343d97e74f cd4208e080
commit 0ab2934344
1 changed files with 4 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2418,6 +2418,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>