summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--telephony/java/android/telephony/UiccCardInfo.java6
-rw-r--r--telephony/java/android/telephony/UiccSlotInfo.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java
index 3843a6240b43..249f740c482b 100644
--- a/telephony/java/android/telephony/UiccCardInfo.java
+++ b/telephony/java/android/telephony/UiccCardInfo.java
@@ -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="
diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java
index 17ce45063d41..dd3639a9a7b9 100644
--- a/telephony/java/android/telephony/UiccSlotInfo.java
+++ b/telephony/java/android/telephony/UiccSlotInfo.java
@@ -279,7 +279,7 @@ public class UiccSlotInfo implements Parcelable {
+ ", mIsEuicc="
+ mIsEuicc
+ ", mCardId="
- + mCardId
+ + SubscriptionInfo.givePrintableIccid(mCardId)
+ ", cardState="
+ mCardStateInfo
+ ", mIsExtendedApduSupported="