Merge "Add method to get phoneId from slotId"
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java
index 562e144..06822d0 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccController.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccController.java
@@ -226,6 +226,21 @@
mDefaultEuiccCardId = UNINITIALIZED_CARD_ID;
}
+ /**
+ * Given the slot index, return the phone ID, or -1 if no phone is associated with the given
+ * slot.
+ * @param slotId the slot index to check
+ * @return the associated phone ID or -1
+ */
+ public int getPhoneIdFromSlotId(int slotId) {
+ for (int i = 0; i < mPhoneIdToSlotId.length; i++) {
+ if (mPhoneIdToSlotId[i] == slotId) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
private int getSlotIdFromPhoneId(int phoneId) {
return mPhoneIdToSlotId[phoneId];
}