Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c61dd4e2 authored by yinxu's avatar yinxu
Browse files

Use current active slot when physical_slot_id is not set 

If the physical_slot_id is not set in the IccCardState, we should route
the IccCardState update to the current active slot. If there is no
active slot, we simply use the phone ID as the slot ID.

Bug:78118600
Test: Unit Test
Change-Id: I1d6c5c12ee97384851c1ecfaf4d56128695e81d8
parent 6462c0a4

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;