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

Commit b7fb3317 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "Do not output user information (phone number)" into lmp-mr1-wfc-dev 

automerge: 89e3abaf

* commit '89e3abaf':
  Do not output user information (phone number)
parents dea7f560 89e3abaf

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

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

        mHandler = new MyHandler(mOwner.getLooper());





        mDialString = dialString;

        mDialString = dialString;

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

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

        dialString = formatDialString(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);

        mAddress = PhoneNumberUtils.extractNetworkPortionAlt(dialString);

        mPostDialString = PhoneNumberUtils.extractPostDialPortion(dialString);

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

        Rlog.d(LOG_TAG, "[CDMAConn] " + msg);

    }

    }





    private String maskDialString(String dialString) {

        if (VDBG) {

            return dialString;

        }



        return "<MASKED>";

    }



    @Override

    @Override

    public int getNumberPresentation() {

    public int getNumberPresentation() {

        return mNumberPresentation;

        return mNumberPresentation;

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

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

        public String toString() {

            return "CdmaNumberInfoRec: {" +

            return "CdmaNumberInfoRec: {" +

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

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

                    ", number: " + number +

                    ", number: <MASKED>" +

                    ", numberType: " + numberType +

                    ", numberType: " + numberType +

                    ", numberPlan: " + numberPlan +

                    ", numberPlan: " + numberPlan +

                    ", pi: " + pi +

                    ", pi: " + pi +