Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SubInfo#toString consistency."

Browse Source 
am: f15b5b38db

Change-Id: I72c286a53c36c62addfe1e46e3a513742d2adf1b
This commit is contained in:
Hunter Knepshield
2019-06-20 17:23:21 -07:00
committed by android-build-merger
parent 6c3f50dc6d f15b5b38db
commit 79d5cbd0e1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -731,19 +731,19 @@ 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)
+ " hplmns = " + Arrays.toString(mHplmns) + " hplmns=" + Arrays.toString(mHplmns)
+ " subscriptionType=" + mSubscriptionType + " subscriptionType=" + mSubscriptionType
+ " mGroupOwner=" + mGroupOwner + "}"; + " mGroupOwner=" + mGroupOwner + "}";
} }