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

Commit ba56149b authored by Jordan Liu's avatar Jordan Liu
Browse files

Get EID from UiccCard, not UiccSlot 

The UiccSlot doesn't hold the EID on HAL 1.2-1.3, instead we get it from
the UiccCard.

Bug: 153019179
Test: builds
Change-Id: Ief890f07958821a877866eacd77ff8160de7b032
parent 29e6226f

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

+2 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,8 @@ public class UiccController extends Handler { 
                boolean defaultEuiccCardIdIsStillInserted = false;

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                for (UiccSlot slot : mUiccSlots) {

                    if (cardString.equals(IccUtils.stripTrailingFs(slot.getEid()))) {

                    if (cardString.equals(

                            IccUtils.stripTrailingFs(slot.getUiccCard().getCardId()))) {

                        defaultEuiccCardIdIsStillInserted = true;

                    }

                }