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

Commit b57c65b0 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev

parents b0e4f9e9 f149dcb3

telephony/java/android/telephony/SubscriptionInfo.java

+16 −1
Original line number Diff line number Diff line
@@ -332,9 +332,24 @@ public class SubscriptionInfo implements Parcelable { 
        return 0;

    }



    /**

     * @hide

     */

    public static String givePrintableIccid(String iccId) {

        String iccIdToPrint = null;

        if (iccId != null) {

            if (iccId.length() > 9) {

                iccIdToPrint = iccId.substring(0, 9) + "XXXXXXXXXXX";

            } else {

                iccIdToPrint = iccId;

            }

        }

        return iccIdToPrint;

    }



    @Override

    public String toString() {

        String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;

        String iccIdToPrint = givePrintableIccid(mIccId);

        return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex

                + " displayName=" + mDisplayName + " carrierName=" + mCarrierName

                + " nameSource=" + mNameSource + " iconTint=" + mIconTint