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

Commit a14abd73 authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge "Use PII Logging for Protected Phone Fields"

parents b165de43 15b604cb

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

+9 −5
Original line number Diff line number Diff line
@@ -3658,15 +3658,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());
@@ -3882,6 +3882,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;