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

Commit b19851c5 authored by Pengquan Meng's avatar Pengquan Meng Committed by Android (Google) Code Review
Browse files

Merge "Strip trailing Fs off raw ICCID"

parents 9503ac71 0a085953

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

+2 −3
Original line number Diff line number Diff line
@@ -558,9 +558,8 @@ 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();

            addCardId(cardString);

            // getCardString() uses the raw ICCID, so we strip it manually

            addCardId(IccUtils.stripTrailingFs(card.getCardId()));

        }



        if (DBG) log("Notifying IccChangedRegistrants");