Merge "Use current active slot when physical_slot_id is not set" into pi-dev (57879397) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/UiccController.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,13 @@ public class UiccController extends Handler {
		if (VDBG) log("onGetIccCardStatusDone: phoneId " + index + " physicalSlotIndex " + slotId);
		if (slotId == INVALID_SLOT_ID) {
		slotId = index;
		// TODO(b/78136265): Remove the below logic once modem fixes the bug in b/78135516.
		for (int i = 0; i < mUiccSlots.length; i++) {
		if (mUiccSlots[i] != null && mUiccSlots[i].isActive()) {
		slotId = i;
		break;
		}
		}
		}
		mPhoneIdToSlotId[index] = slotId;