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

Commit edb3e722 authored by Sanket Padawe's avatar Sanket Padawe Committed by The Android Automerger
Browse files

Fix a crash while printing ICCID because of alphabets in UICC. 

Bug: 25401769
Change-Id: Ibe521237989b7f640cafcf8c21a5b8ff6b87d723
parent 09ee5a47

src/java/com/android/internal/telephony/SubscriptionController.java

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class SubscriptionController extends ISub.Stub { 
        String countryIso = getSubscriptionCountryIso(id);



        if (DBG) {

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

            String iccIdToPrint = SubscriptionInfo.givePrintableIccid(iccId);

            logd("[getSubInfoRecord] id:" + id + " iccid:" + iccIdToPrint + " simSlotIndex:" + simSlotIndex

                + " displayName:" + displayName + " nameSource:" + nameSource

                + " iconTint:" + iconTint + " dataRoaming:" + dataRoaming

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

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.RegistrantList; 
import android.telephony.Rlog;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.telephony.SubscriptionInfo;



import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
@@ -115,7 +116,7 @@ public abstract class IccRecords extends Handler implements IccConstants { 


    @Override

    public String toString() {

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

        String iccIdToPrint = SubscriptionInfo.givePrintableIccid(mIccId);

        return "mDestroyed=" + mDestroyed

                + " mContext=" + mContext

                + " mCi=" + mCi
@@ -719,7 +720,8 @@ public abstract class IccRecords extends Handler implements IccConstants { 
        pw.println(" mRecordsRequested=" + mRecordsRequested);

        pw.println(" mRecordsToLoad=" + mRecordsToLoad);

        pw.println(" mRdnCache=" + mAdnCache);

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

        String iccIdToPrint = SubscriptionInfo.givePrintableIccid(mIccId);



        pw.println(" iccid=" + iccIdToPrint);

        if (TextUtils.isEmpty(mMsisdn)) {

            pw.println(" mMsisdn=null");