summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Naoyuki Konda <naoyuki.konda@sony.com> 2018-02-16 14:13:12 +0900
committer Naoyuki Konda <naoyuki.konda@sony.com> 2018-02-20 19:48:24 +0900
commit8b34ac657f1817166fff1eab616a67e6ac9fdf23 (patch)
tree732c1504fe188f61bf1595af4cca4a2d247946fd
parentb0817b238a9c6702218ba57a6105c4fbac339ca4 (diff)
Hide APN, USER and Password from log in SETUP_DATA_CALL
Some operators don't want to show apn, user, password. Test: manual Bug: 35411757 Change-Id: I357fd561d5b8aa9c6596786c9731e8f3cd9c532c
-rw-r--r--telephony/java/android/telephony/data/DataProfile.java7
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;