diff options
| author | 2018-02-27 02:16:40 +0000 | |
|---|---|---|
| committer | 2018-02-27 02:16:40 +0000 | |
| commit | 4f66562c8fc3fed901023ead4809c9a89f3769de (patch) | |
| tree | 8c824bfdd76081d7843c699756e29aa3db823080 | |
| parent | 255ed5cbdcfcc0a70b3a83da7cd8041792f8cf62 (diff) | |
| parent | 5f676ad625c801692ee6128a6f59a87182bb70f7 (diff) | |
Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am: d676c5c134 am: 1d2ddbb9ae
am: 5f676ad625
Change-Id: I33817c1902c72aac417865287d137f8e1e919480
| -rw-r--r-- | telephony/java/android/telephony/data/DataProfile.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/data/DataProfile.java b/telephony/java/android/telephony/data/DataProfile.java index 41c1430e386f..e8597b221391 100644 --- a/telephony/java/android/telephony/data/DataProfile.java +++ b/telephony/java/android/telephony/data/DataProfile.java @@ -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; |