Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81ef47f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Renamed the id printing method" into udc-dev am: f166dde0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21972616



Change-Id: I52bdb1e213e00982038a698bd055a5cc60c74e5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c73b5006 f166dde0

telephony/java/android/service/euicc/EuiccProfileInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+12 −11
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/UiccPortInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ public class UiccSlotInfo implements Parcelable { 
                + ", mIsEuicc="

                + mIsEuicc

                + ", mCardId="

                + SubscriptionInfo.givePrintableIccid(mCardId)

                + SubscriptionInfo.getPrintableId(mCardId)

                + ", cardState="

                + mCardStateInfo

                + ", mIsExtendedApduSupported="