From 597c6bad06fc084bbe2074e60d7c12c66370c230 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 1 Aug 2019 15:45:48 -0700 Subject: [PATCH] Add documentation in TelephonyManager#getNetworkCountryIso In multi-sim, 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. Test: unit test Bug: 137236159 Bug: 137235431 Change-Id: I311e690d1f79ebefbc068c486d9bed814c129aab Merged-In: I311e690d1f79ebefbc068c486d9bed814c129aab (cherry picked from commit 8ab9550f86c10ccb86353f59790ce2b5d329f716) --- telephony/java/android/telephony/TelephonyManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fe812151489b7..d72ca6bec1892 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2327,6 +2327,10 @@ public class TelephonyManager { *

* The ISO-3166 country code is provided in lowercase 2 character format. *

+ * 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). *