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

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

Strip trailing Fs off raw ICCID 

Test: manual
Bug: 121229736
Change-Id: Ib83d540fafe31c074375678d1cb913a11e505620
Merged-In: Ib83d540fafe31c074375678d1cb913a11e505620
parent 9d717e45

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

+4 −1
Original line number Diff line number Diff line
@@ -558,8 +558,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);

        }