summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amit Mahajan <amitmahajan@google.com> 2018-06-25 17:10:30 -0700
committer android-build-merger <android-build-merger@google.com> 2018-06-25 17:10:30 -0700
commitee44571c3474675b01a229d2456e5d7dda51836c (patch)
treea7a907fd41865097e8ee022582cd8f64bc29540c
parentda3fb57d52756628f5d4f3653d9a1242ec694e7e (diff)
parent6790ba2a59ed82aa58dc68829ebde2148b697529 (diff)
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am: 3838ff457e am: 12b08d00b8
am: 6790ba2a59 Change-Id: Ie080da96f604462ec30c1c10752707d402a547d6
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 102d5a070d42..6e261dd98cac 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2783,7 +2783,8 @@ public class TelephonyManager {
}
/**
- * Gets all the UICC slots.
+ * Gets all the UICC slots. The objects in the array can be null if the slot info is not
+ * available, which is possible between phone process starting and getting slot info from modem.
*
* @return UiccSlotInfo array.
*