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

Commit 1d2ddbb9 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

Change-Id: Ie81e3f51647b866fbe1f6b2d0e93d5f3e7696837
parents af8f4b19 d676c5c1

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

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



import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

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


    @Override

    public String toString() {

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

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

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

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

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

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

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

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

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