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

Commit 3b004c19 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Use PII Logging for Protected Phone Fields" 

am: a14abd73

Change-Id: I093bf2786e781079c412752cca6a5bde881f4975
parents bba7dc83 a14abd73

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

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