summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuo Qian <shuoq@google.com> 2019-08-05 13:30:31 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-05 13:30:31 -0700
commit06a0b6a01050e4e66a2f0c1caa88d3fe4f689ae7 (patch)
treeed971454d5a4b3c581528256c11e3ebc32ed2591
parented6390325052c3acfd2fba441282589595cfbd5b (diff)
parent753f6c3e5a5792746b3952d680ac2dc88ed8c7d5 (diff)
Merge "Add documentation in TelephonyManager#getNetworkCountryIso"
am: 753f6c3e5a Change-Id: Iae5df44de8a307888b4eff8d581ddefd68ad3450
-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>