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

Commit 7a580e32 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Strip trailing Fs off raw ICCID"

parents 805b5ca6 a8eb4c65

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

+4 −1
Original line number Diff line number Diff line
@@ -559,8 +559,11 @@ public class UiccController extends Handler { 


        UiccCard card = mUiccSlots[slotId].getUiccCard();

        if (card != null && (card.getCardState() == CardState.CARDSTATE_PRESENT)) {

            // Card.getCardId returns the cardString, not the public card ID int

            String cardString = card.getCardId();

            if (!mUiccSlots[slotId].isEuicc()) {

                // getCardId() returns the raw ICCID for a UICC, so we strip it manually

                cardString = IccUtils.stripTrailingFs(cardString);

            }

            addCardId(cardString);

        }