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

Commit 0b92ff82 authored by Jinyoung Jeong's avatar Jinyoung Jeong
Browse files

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: Ia90ef5bdc7c6d63bf2d20ac97460ccc566dddb12
parent 1cbd74a9

src/java/com/android/internal/telephony/uicc/IccSlotStatus.java

+4 −2
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


package com.android.internal.telephony.uicc;



import android.telephony.SubscriptionInfo;

import android.text.TextUtils;



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

import com.android.telephony.Rlog;



import java.util.Arrays;



/**
@@ -61,7 +63,7 @@ public class IccSlotStatus { 
        StringBuilder sb = new StringBuilder();

        sb.append("IccSlotStatus {").append(cardState).append(",")

                .append("atr=").append(atr).append(",")

                .append("eid=").append(eid).append(",");

                .append("eid=").append(Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, eid)).append(",");

        if (mSimPortInfos != null) {

            sb.append("num_ports=").append(mSimPortInfos.length);

            for (int i =0; i < mSimPortInfos.length; i++) {

src/java/com/android/internal/telephony/uicc/UiccController.java

+16 −9
Original line number Diff line number Diff line
@@ -826,7 +826,8 @@ public class UiccController extends Handler { 
                if (mDefaultEuiccCardId == UNINITIALIZED_CARD_ID

                        || mDefaultEuiccCardId == TEMPORARILY_UNSUPPORTED_CARD_ID) {

                    mDefaultEuiccCardId = convertToPublicCardId(cardString);

                    logWithLocalLog("IccCardStatus eid=" + cardString + " slot=" + slotId

                    logWithLocalLog("IccCardStatus eid="

                            + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, cardString) + " slot=" + slotId

                            + " mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                }

            }
@@ -1077,8 +1078,9 @@ public class UiccController extends Handler { 
                if (!mUiccSlots[i].isRemovable() && !isDefaultEuiccCardIdSet) {

                    isDefaultEuiccCardIdSet = true;

                    mDefaultEuiccCardId = convertToPublicCardId(eid);

                    logWithLocalLog("Using eid=" + eid + " in slot=" + i

                            + " to set mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                    logWithLocalLog("Using eid=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, eid)

                            + " in slot=" + i + " to set mDefaultEuiccCardId="

                            + mDefaultEuiccCardId);

                }

            }

        }
@@ -1095,8 +1097,10 @@ public class UiccController extends Handler { 
                    if (!TextUtils.isEmpty(eid)) {

                        isDefaultEuiccCardIdSet = true;

                        mDefaultEuiccCardId = convertToPublicCardId(eid);

                        logWithLocalLog("Using eid=" + eid + " from removable eUICC in slot="

                                + i + " to set mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                        logWithLocalLog("Using eid="

                                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, eid)

                                + " from removable eUICC in slot=" + i

                                + " to set mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                        break;

                    }

                }
@@ -1274,14 +1278,17 @@ public class UiccController extends Handler { 
                || mDefaultEuiccCardId == TEMPORARILY_UNSUPPORTED_CARD_ID) {

            if (!mUiccSlots[slotId].isRemovable()) {

                mDefaultEuiccCardId = convertToPublicCardId(eid);

                logWithLocalLog("onEidReady: eid=" + eid + " slot=" + slotId

                        + " mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                logWithLocalLog("onEidReady: eid="

                        + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, eid)

                        + " slot=" + slotId + " mDefaultEuiccCardId=" + mDefaultEuiccCardId);

            } else if (!mHasActiveBuiltInEuicc) {

                // we only set a removable eUICC to the default if there are no active non-removable

                // eUICCs

                mDefaultEuiccCardId = convertToPublicCardId(eid);

                logWithLocalLog("onEidReady: eid=" + eid + " from removable eUICC in slot=" + slotId

                        + " mDefaultEuiccCardId=" + mDefaultEuiccCardId);

                logWithLocalLog("onEidReady: eid="

                        + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, eid)

                        + " from removable eUICC in slot=" + slotId + " mDefaultEuiccCardId="

                        + mDefaultEuiccCardId);

            }

        }

        card.unregisterForEidReady(this);

src/java/com/android/internal/telephony/uicc/UiccSlot.java

+6 −4
Original line number Diff line number Diff line
@@ -42,12 +42,13 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.uicc.IccCardStatus.CardState;

import com.android.internal.telephony.uicc.euicc.EuiccCard;

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

import com.android.telephony.Rlog;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -152,7 +153,8 @@ public class UiccSlot extends Handler { 
                    // The EID should be reported with the card status, but in case it's not we want

                    // to catch that here

                    if (TextUtils.isEmpty(ics.eid)) {

                        loge("update: eid is missing. ics.eid=" + ics.eid);

                        loge("update: eid is missing. ics.eid="

                                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, ics.eid));

                    }

                    mUiccCard = new EuiccCard(mContext, ci, ics, phoneId, mLock,

                            isMultipleEnabledProfileSupported());
@@ -610,7 +612,7 @@ public class UiccSlot extends Handler { 
        pw.println(" mLastRadioState=" + mLastRadioState);

        pw.println(" mIccIds=" + getPrintableIccIds());

        pw.println(" mPortIdxToPhoneId=" + mPortIdxToPhoneId);

        pw.println(" mEid=" + mEid);

        pw.println(" mEid=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mEid));

        pw.println(" mCardState=" + mCardState);

        if (mUiccCard != null) {

            pw.println(" mUiccCard=" + mUiccCard);