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

Commit 5f676ad6 authored by Naoyuki Konda's avatar Naoyuki Konda Committed by android-build-merger
Browse files

Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am: d676c5c1 

am: 1d2ddbb9

Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a
parents b4654687 1d2ddbb9

telephony/java/android/telephony/data/DataProfile.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.telephony.data;

package android.telephony.data;





import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -230,8 +231,10 @@ public final class DataProfile implements Parcelable { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        return "DataProfile=" + mProfileId + "/" + mApn + "/" + mProtocol + "/" + mAuthType

        return "DataProfile=" + mProfileId + "/" + mProtocol + "/" + mAuthType

                + "/" + mUserName + "/" + mPassword + "/" + mType + "/" + mMaxConnsTime

                + "/" + (Build.IS_USER ? "***/***/***" :

                         (mApn + "/" + mUserName + "/" + mPassword))

                + "/" + mType + "/" + mMaxConnsTime

                + "/" + mMaxConns + "/" + mWaitTime + "/" + mEnabled + "/"

                + "/" + mMaxConns + "/" + mWaitTime + "/" + mEnabled + "/"

                + mSupportedApnTypesBitmap + "/" + mRoamingProtocol + "/" + mBearerBitmap + "/"

                + mSupportedApnTypesBitmap + "/" + mRoamingProtocol + "/" + mBearerBitmap + "/"

                + mMtu + "/" + mMvnoType + "/" + mMvnoMatchData + "/" + mModemCognitive;

                + mMtu + "/" + mMvnoType + "/" + mMvnoMatchData + "/" + mModemCognitive;