summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuo Qian <shuoq@google.com> 2019-08-05 13:42:24 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-05 13:42:24 -0700
commit2f462866b3100a288b5748ee75a8c8b35f267ac4 (patch)
tree710ea0e80c34ba7eb7c05b0a3d76987dfabbd982
parent807b7fde15bc3e2cafb2187d55d824f4081d50c1 (diff)
parent06a0b6a01050e4e66a2f0c1caa88d3fe4f689ae7 (diff)
Merge "Add documentation in TelephonyManager#getNetworkCountryIso" am: 753f6c3e5a
am: 06a0b6a010 Change-Id: I9268455d8074763205c4c6f3f9101ace0b6ea12a
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 24110d6f5e6d..b830860dbc50 100644
--- 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>