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

Commit f10775f4 authored by Hunter Knepshield's avatar Hunter Knepshield Committed by Automerger Merge Worker
Browse files

Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed098 am: 98dbfc41 

Change-Id: I8611fb21d7a821cd57078ea3b24339769c47bf9e
parents a7ba1721 98dbfc41

telephony/java/android/telephony/SubscriptionInfo.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -837,20 +837,20 @@ public class SubscriptionInfo implements Parcelable { 
                + " carrierId=" + mCarrierId + " displayName=" + mDisplayName

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

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

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

                + " iconTint=" + mIconTint

                + " iconTint=" + mIconTint

                + " mNumber=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mNumber)

                + " number=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mNumber)

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

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

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

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

                + " nativeAccessRules " + Arrays.toString(mNativeAccessRules)

                + " nativeAccessRules=" + Arrays.toString(mNativeAccessRules)

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

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

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

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

                + " mIsGroupDisabled=" + mIsGroupDisabled

                + " isGroupDisabled=" + mIsGroupDisabled

                + " profileClass=" + mProfileClass

                + " profileClass=" + mProfileClass

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

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

                + " hplmns=" + Arrays.toString(mHplmns)

                + " hplmns=" + Arrays.toString(mHplmns)

                + " subscriptionType=" + mSubscriptionType

                + " subscriptionType=" + mSubscriptionType

                + " mGroupOwner=" + mGroupOwner

                + " groupOwner=" + mGroupOwner

                + " carrierConfigAccessRules=" + Arrays.toString(mCarrierConfigAccessRules)

                + " carrierConfigAccessRules=" + Arrays.toString(mCarrierConfigAccessRules)

                + " mAreUiccApplicationsEnabled=" + mAreUiccApplicationsEnabled + "}";

                + " areUiccApplicationsEnabled=" + mAreUiccApplicationsEnabled + "}";

    }

    }





    @Override

    @Override