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

Commit 936cf96a authored by Etan Cohen's avatar Etan Cohen
Browse files

Do not output user information (phone number) 

Elmiinate leakage of user information - phone number. Restrict to cases where
VDBG is enabled - flagged by STOPSHIP.

Bug: 19602904
Change-Id: I3e5b1f9ed8e825010f4711923dc673f25e2f7724
parent e51d9185

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

+11 −2
Original line number Diff line number Diff line
@@ -136,9 +136,10 @@ public class CdmaConnection extends Connection { 
        mHandler = new MyHandler(mOwner.getLooper());



        mDialString = dialString;

        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + dialString);

        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection: dialString=" + maskDialString(dialString));

        dialString = formatDialString(dialString);

        Rlog.d(LOG_TAG, "[CDMAConn] CdmaConnection:formated dialString=" + dialString);

        Rlog.d(LOG_TAG,

                "[CDMAConn] CdmaConnection:formated dialString=" + maskDialString(dialString));



        mAddress = PhoneNumberUtils.extractNetworkPortionAlt(dialString);

        mPostDialString = PhoneNumberUtils.extractPostDialPortion(dialString);
@@ -911,6 +912,14 @@ public class CdmaConnection extends Connection { 
        Rlog.d(LOG_TAG, "[CDMAConn] " + msg);

    }



    private String maskDialString(String dialString) {

        if (VDBG) {

            return dialString;

        }



        return "<MASKED>";

    }



    @Override

    public int getNumberPresentation() {

        return mNumberPresentation;

src/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public final class CdmaInformationRecords { 
        public String toString() {

            return "CdmaNumberInfoRec: {" +

                    " id: " + CdmaInformationRecords.idToString(id) +

                    ", number: " + number +

                    ", number: <MASKED>" +

                    ", numberType: " + numberType +

                    ", numberPlan: " + numberPlan +

                    ", pi: " + pi +