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

Commit ef092664 authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by android-build-merger
Browse files

Merge "Revert "Use current active slot when physical_slot_id is not set"" into pi-dev 

am: d324ff24

Change-Id: I918c7e60e07f79b385d93bb761a2bbf4ec0dd0db
parents 3e728794 d324ff24

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

+0 −7
Original line number Diff line number Diff line
@@ -492,13 +492,6 @@ 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;