Merge "Logged Euicc eid in UiccController" into tm-dev (247a9e5d) · Commits · e / os / android_frameworks_base

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

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