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

Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e am: 15e6f1e9f0 am: af14bbe0e0

Browse Source 
Change-Id: I30738d88a0202fc32b51c22e143af076028639df
This commit is contained in:
Hunter Knepshield
2020-05-18 22:50:36 +00:00
committed by Automerger Merge Worker
parent d20c4aae3a af14bbe0e0
commit 2ea9511187
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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