From d0aabe4264b811a1b4fc14224a4e48b3b3c1025e Mon Sep 17 00:00:00 2001
From: Jinyoung Jeong <jinjeong@google.com>
Date: Thu, 31 Mar 2022 10:25:43 +0000
Subject: [PATCH] Logged Euicc eid in UiccController

Security Report - ID: Logged Euicc eid in UiccController

Bug: b/220735813
Test: Manual testing
and verified log from both debug and non-debug build

Change-Id: I1ee47b74756caa4f0425fb18534a4459379b68f4
---
 telephony/java/android/telephony/UiccCardInfo.java | 6 ++++--
 telephony/java/android/telephony/UiccSlotInfo.java | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/UiccCardInfo.java b/telephony/java/android/telephony/UiccCardInfo.java
index 3843a6240b43f..249f740c482b7 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 17ce45063d41d..dd3639a9a7b99 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="