Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1d2ddbb9ae

Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a
This commit is contained in:
Naoyuki Konda
2018-02-27 02:03:54 +00:00
committed by android-build-merger
parent b4654687ef 1d2ddbb9ae
commit 5f676ad625
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/data/DataProfile.java
View File

@@ -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;