diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 728dfa64090c4..f7c8237bdda4f 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/telephony/java/android/service/euicc/EuiccProfileInfo.java @@ -453,7 +453,7 @@ public final class EuiccProfileInfo implements Parcelable { + ", accessRules=" + Arrays.toString(mAccessRules) + ", iccid=" - + SubscriptionInfo.givePrintableIccid(mIccid) + + SubscriptionInfo.getPrintableId(mIccid) + ")"; } } diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 3b84b65891daa..faf97b57594e6 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -947,29 +947,30 @@ public class SubscriptionInfo implements Parcelable { } /** - * Get ICCID stripped PII information on user build. + * Get stripped PII information from the id. * - * @param iccId The original ICCID. + * @param id The raw id (e.g. ICCID, IMSI, etc...). * @return The stripped string. * * @hide */ - public static String givePrintableIccid(String iccId) { - String iccIdToPrint = null; - if (iccId != null) { - if (iccId.length() > 9 && !TelephonyUtils.IS_DEBUGGABLE) { - iccIdToPrint = iccId.substring(0, 9) + Rlog.pii(false, iccId.substring(9)); + @Nullable + public static String getPrintableId(@Nullable String id) { + String idToPrint = null; + if (id != null) { + if (id.length() > 9 && !TelephonyUtils.IS_DEBUGGABLE) { + idToPrint = id.substring(0, 9) + Rlog.pii(false, id.substring(9)); } else { - iccIdToPrint = iccId; + idToPrint = id; } } - return iccIdToPrint; + return idToPrint; } @Override public String toString() { - String iccIdToPrint = givePrintableIccid(mIccId); - String cardStringToPrint = givePrintableIccid(mCardString); + String iccIdToPrint = getPrintableId(mIccId); + String cardStringToPrint = getPrintableId(mCardString); return "[SubscriptionInfo: id=" + mId + " iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex diff --git a/telephony/java/android/telephony/UiccPortInfo.java b/telephony/java/android/telephony/UiccPortInfo.java index 6fb0470d6225f..41e743c43272e 100644 --- a/telephony/java/android/telephony/UiccPortInfo.java +++ b/telephony/java/android/telephony/UiccPortInfo.java @@ -165,7 +165,7 @@ public final class UiccPortInfo implements Parcelable{ return "UiccPortInfo (isActive=" + mIsActive + ", iccId=" - + SubscriptionInfo.givePrintableIccid(mIccId) + + SubscriptionInfo.getPrintableId(mIccId) + ", portIndex=" + mPortIndex + ", mLogicalSlotIndex=" diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index 5e02532e85a83..1863a03b58fec 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -281,7 +281,7 @@ public class UiccSlotInfo implements Parcelable { + ", mIsEuicc=" + mIsEuicc + ", mCardId=" - + SubscriptionInfo.givePrintableIccid(mCardId) + + SubscriptionInfo.getPrintableId(mCardId) + ", cardState=" + mCardStateInfo + ", mIsExtendedApduSupported="