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

Commit 15b604cb authored by Nathan Harold's avatar Nathan Harold
Browse files

Use PII Logging for Protected Phone Fields 

Make the PII restriction of protected fields in the Phone
follow the same paradigm for PII logs elsewhere. This will
ensure that there is a log entry for items even if the
contents are redacted.

Bug: 135605848
Test: dump TelephonyDebugService
Change-Id: I423fc85532d978ad33def78bc74da3dd528eabab
parent 73c30705

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

+9 −5
Original line number Diff line number Diff line
@@ -3657,15 +3657,15 @@ public class GsmCdmaPhone extends Phone { 
        pw.println(" mSST=" + mSST);

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

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

        if (VDBG) pw.println(" mImei=" + mImei);

        if (VDBG) pw.println(" mImeiSv=" + mImeiSv);

        if (VDBG) pw.println(" mVmNumber=" + mVmNumber);

        pw.println(" mImei=" + pii(mImei));

        pw.println(" mImeiSv=" + pii(mImeiSv));

        pw.println(" mVmNumber=" + pii(mVmNumber));

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

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

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

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

        if (VDBG) pw.println(" mEsn=" + mEsn);

        if (VDBG) pw.println(" mMeid=" + mMeid);

        pw.println(" mEsn=" + pii(mEsn));

        pw.println(" mMeid=" + pii(mMeid));

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

        if (!isPhoneTypeGsm()) {

            pw.println(" getCdmaEriIconIndex()=" + getCdmaEriIconIndex());
@@ -3881,6 +3881,10 @@ public class GsmCdmaPhone extends Phone { 
        Rlog.e(LOG_TAG, "[" + mPhoneId + "] " + s);

    }



    private static String pii(String s) {

        return Rlog.pii(LOG_TAG, s);

    }



    @Override

    public boolean isUtEnabled() {

        Phone imsPhone = mImsPhone;