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

Commit 944761ad authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Remove iccid from logging 

Bug: 220737443
Bug: 220737308
Bug: 220735679
Bug: 220737041
Bug: 220737033
Bug: 220735331
Test: Build
Change-Id: I8a971be8032d1d5cb2c4d66e83585e27d9cc3885
parent 63c13d32

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

+1 −1
Original line number Diff line number Diff line
@@ -5002,7 +5002,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        pw.println(" isDnsCheckDisabled()=" + isDnsCheckDisabled());

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

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

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

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

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

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

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

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

+3 −2
Original line number Diff line number Diff line
@@ -834,13 +834,14 @@ public class SubscriptionController extends ISub.Stub { 
                for (SubscriptionInfo si : subList) {

                    if (iccId.equals(si.getIccId())) {

                        if (DBG)

                            logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId + " subInfo=" + si);

                            logd("[getActiveSubInfoUsingIccId]+ iccId="

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

                        return si;

                    }

                }

            }

            if (DBG) {

                logd("[getActiveSubInfoUsingIccId]+ iccId=" + iccId

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

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

            }

        } finally {

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

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ 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: "

                    + sIccId[phoneId] + ", phoneId:" + phoneId);

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

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

        }

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

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


package com.android.internal.telephony.uicc;



import android.telephony.SubscriptionInfo;

import android.text.TextUtils;



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

    public String toString() {

        StringBuilder sb = new StringBuilder();

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

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

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

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

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

                .append("}");

        return sb.toString();

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

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public class UiccCard { 
    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("UiccCard:");

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

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

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

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

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

        pw.println();