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

Commit 49fa3725 authored by Hunter Knepshield's avatar Hunter Knepshield
Browse files

Fix SubInfo#toString consistency. 

MCC was previously running into the country ISO.

"... mnc 260mCountryIso=US ..."

Some fields had odd spacing/delimiters.

Test: compilation (trivial)
Change-Id: I217fbbdf3a2783e8b98ceecbf62e21482b58db37
parent dd98a700

telephony/java/android/telephony/SubscriptionInfo.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -731,15 +731,15 @@ public class SubscriptionInfo implements Parcelable { 
    public String toString() {

    public String toString() {

        String iccIdToPrint = givePrintableIccid(mIccId);

        String iccIdToPrint = givePrintableIccid(mIccId);

        String cardStringToPrint = givePrintableIccid(mCardString);

        String cardStringToPrint = givePrintableIccid(mCardString);

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

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

                + " carrierId=" + mCarrierId + " displayName=" + mDisplayName

                + " carrierId=" + mCarrierId + " displayName=" + mDisplayName

                + " carrierName=" + mCarrierName + " nameSource=" + mNameSource

                + " carrierName=" + mCarrierName + " nameSource=" + mNameSource

                + " iconTint=" + mIconTint + " mNumber=" + Rlog.pii(Build.IS_DEBUGGABLE, mNumber)

                + " iconTint=" + mIconTint + " mNumber=" + Rlog.pii(Build.IS_DEBUGGABLE, mNumber)

                + " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc

                + " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc=" + mMcc

                + " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded

                + " mnc=" + mMnc + " mCountryIso=" + mCountryIso + " isEmbedded=" + mIsEmbedded

                + " accessRules " + Arrays.toString(mAccessRules)

                + " accessRules=" + Arrays.toString(mAccessRules)

                + " cardString=" + cardStringToPrint + " cardId=" + mCardId

                + " cardString=" + cardStringToPrint + " cardId=" + mCardId

                + " isOpportunistic " + mIsOpportunistic + " mGroupUUID=" + mGroupUUID

                + " isOpportunistic=" + mIsOpportunistic + " mGroupUUID=" + mGroupUUID

                + " mIsGroupDisabled=" + mIsGroupDisabled

                + " mIsGroupDisabled=" + mIsGroupDisabled

                + " profileClass=" + mProfileClass

                + " profileClass=" + mProfileClass

                + " ehplmns=" + Arrays.toString(mEhplmns)

                + " ehplmns=" + Arrays.toString(mEhplmns)