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

Commit 0d9de2a5 authored by Jordan Liu's avatar Jordan Liu Committed by Automerger Merge Worker
Browse files

Merge "Get EID from UiccCard, not UiccSlot" into rvc-dev am: 005f8585 am:... 

Merge "Get EID from UiccCard, not UiccSlot" into rvc-dev am: 005f8585 am: ba016805 am: f119cc28 am: 28e8fbec

Change-Id: I7fe598bca1b1367eb6c1f2660ebabb1c8b50efa4
parents 357d324a 28e8fbec

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;

                    }

                }