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

Commit 2f73884a authored by Muralidhar Reddy's avatar Muralidhar Reddy Committed by Automerger Merge Worker
Browse files

print redacted iccid, eid in user build only am: d3ea82ea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21467583



Change-Id: Ib10898a72e3093c760abf53f14784a0fe97ac773
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5210a5d d3ea82ea

src/java/com/android/internal/telephony/SubscriptionController.java

+4 −2
Original line number Diff line number Diff line
@@ -828,13 +828,15 @@ public class SubscriptionController extends ISub.Stub { 
                    if (iccId.equals(si.getIccId())) {

                        if (DBG)

                            logd("[getActiveSubInfoUsingIccId]+ iccId="

                                    + Rlog.pii(LOG_TAG, iccId) + " subInfo=" + si);

                                    + SubscriptionInfo.givePrintableIccid(iccId)

                                    + " subInfo=" + si);

                        return si;

                    }

                }

            }

            if (DBG) {

                logd("[getActiveSubInfoUsingIccId]+ iccId=" + Rlog.pii(LOG_TAG, iccId)

                logd("[getActiveSubInfoUsingIccId]+ iccId="

                        + SubscriptionInfo.givePrintableIccid(iccId)

                        + " subList=" + subList + " subInfo=null");

            }

        } finally {

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+2 −1
Original line number Diff line number Diff line
@@ -852,7 +852,8 @@ public class SubscriptionInfoUpdater extends Handler { 
        // If SIM is not absent, insert new record or update existing record.

        if (!ICCID_STRING_FOR_NO_SIM.equals(sIccId[phoneId]) && sIccId[phoneId] != null) {

            logd("updateSubscriptionInfoByIccId: adding subscription info record: iccid: "

                    + Rlog.pii(LOG_TAG, sIccId[phoneId]) + ", phoneId:" + phoneId);

                    + SubscriptionInfo.givePrintableIccid(sIccId[phoneId])

                    + ", phoneId:" + phoneId);

            mSubscriptionManager.addSubscriptionInfoRecord(sIccId[phoneId], phoneId);

        }

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3899,7 +3899,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
        pw.println("ICCID:");

        pw.increaseIndent();

        for (int i = 0; i < mTelephonyManager.getActiveModemCount(); i++) {

            pw.println("slot " + i + ": " + getIccId(i));

            pw.println("slot " + i + ": " + SubscriptionInfo.givePrintableIccid(getIccId(i)));

        }

        pw.decreaseIndent();

        pw.println();

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

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony.uicc;



import android.telephony.SubscriptionInfo;

import android.text.TextUtils;



import java.util.Objects;
@@ -49,7 +50,9 @@ public class IccSimPortInfo { 
    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append("{").append("logicalSlotIndex=").append(mLogicalSlotIndex).append(",")

        sb.append("{").append("iccid=")

                .append(SubscriptionInfo.givePrintableIccid(mIccId)).append(",")

                .append("logicalSlotIndex=").append(mLogicalSlotIndex).append(",")

                .append("portActive=").append(mPortActive)

                .append("}");

        return sb.toString();

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.internal.telephony.uicc.IccCardStatus.CardState; 
import com.android.internal.telephony.uicc.IccSlotStatus.MultipleEnabledProfilesMode;

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

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

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

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -221,7 +222,7 @@ public class UiccCard { 
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("UiccCard:");

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

        pw.println(" mCardId=" + Rlog.pii(LOG_TAG, mCardId));

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

        pw.println(" mNumberOfPorts=" + mUiccPorts.size());

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

        pw.println();