Fix a crash while printing ICCID because of alphabets in UICC. (f149dcb3) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionInfo.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -332,9 +332,24 @@ public class SubscriptionInfo implements Parcelable {
		return 0;
		}

		/**
		* @hide
		*/
		public static String givePrintableIccid(String iccId) {
		String iccIdToPrint = null;
		if (iccId != null) {
		if (iccId.length() > 9) {
		iccIdToPrint = iccId.substring(0, 9) + "XXXXXXXXXXX";
		} else {
		iccIdToPrint = iccId;
		}
		}
		return iccIdToPrint;
		}

		@Override
		public String toString() {
		String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
		String iccIdToPrint = givePrintableIccid(mIccId);
		return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
		+ " displayName=" + mDisplayName + " carrierName=" + mCarrierName
		+ " nameSource=" + mNameSource + " iconTint=" + mIconTint