am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '001a651e4b0919239f09b25ae99d132585b5d382':
  Mask IccId which gets printed in bug reports & radio logs.
This commit is contained in:
Sanket Padawe
2015-10-16 00:51:49 +00:00
committed by Android Git Automerger

View File

@@ -334,7 +334,8 @@ public class SubscriptionInfo implements Parcelable {
@Override
public String toString() {
return "{id=" + mId + ", iccId=" + mIccId + " simSlotIndex=" + mSimSlotIndex
String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
+ " displayName=" + mDisplayName + " carrierName=" + mCarrierName
+ " nameSource=" + mNameSource + " iconTint=" + mIconTint
+ " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc