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

Commit 7a366fba authored by Jinyoung Jeong's avatar Jinyoung Jeong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "pii_eid_log-tm-dev" into tm-mainline-prod 

* changes:
  [automerge] Logged Euicc eid in UiccController 2p: d0aabe42
  Logged Euicc eid in UiccController
parents 200b8ea4 6c7ac243

telephony/java/android/telephony/UiccCardInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import android.content.pm.PackageManager; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;
@@ -227,7 +230,6 @@ public final class UiccCardInfo implements Parcelable { 
        this.mIccIdAccessRestricted = iccIdAccessRestricted;

    }





    @Override

    public boolean equals(Object obj) {

        if (this == obj) {
@@ -261,7 +263,7 @@ public final class UiccCardInfo implements Parcelable { 
                + ", mCardId="

                + mCardId

                + ", mEid="

                + mEid

                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mEid)

                + ", mPhysicalSlotIndex="

                + mPhysicalSlotIndex

                + ", mIsRemovable="

telephony/java/android/telephony/UiccSlotInfo.java

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

                + mIsEuicc

                + ", mCardId="

                + mCardId

                + SubscriptionInfo.givePrintableIccid(mCardId)

                + ", cardState="

                + mCardStateInfo

                + ", mIsExtendedApduSupported="