Merge "Renamed the id printing method" into udc-dev

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)
                 + ")";
     }
 }

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) {
+    @Nullable
-        String iccIdToPrint = null;
+    public static String getPrintableId(@Nullable String id) {
-        if (iccId != null) {
+        String idToPrint = null;
-            if (iccId.length() > 9 && !TelephonyUtils.IS_DEBUGGABLE) {
+        if (id != null) {
-                iccIdToPrint = iccId.substring(0, 9) + Rlog.pii(false, iccId.substring(9));
+            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 iccIdToPrint = getPrintableId(mIccId);
-        String cardStringToPrint = givePrintableIccid(mCardString);
+        String cardStringToPrint = getPrintableId(mCardString);
         return "[SubscriptionInfo: id=" + mId
                 + " iccId=" + iccIdToPrint
                 + " simSlotIndex=" + mSimSlotIndex

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="

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="