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

Commit 005f8585 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Get EID from UiccCard, not UiccSlot" into rvc-dev

parents 604ccea4 ba56149b

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

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

                boolean defaultEuiccCardIdIsStillInserted = false;

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                for (UiccSlot slot : mUiccSlots) {

                for (UiccSlot slot : mUiccSlots) {

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

                    if (cardString.equals(

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

                        defaultEuiccCardIdIsStillInserted = true;

                        defaultEuiccCardIdIsStillInserted = true;

                    }

                    }

                }

                }