summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sanket Padawe <sanketpadawe@google.com> 2015-10-16 12:07:57 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-16 12:07:57 +0000
commit4ae088957fc772f0dbbf66d88aaec2f4df49bea5 (patch)
tree63c7cfab102a8c6e1fb5a3da3ac222d378a291ac
parent604834cadbf16649ca60b704f681d4293505786c (diff)
parent902cb106fe8d06274462e4cea4afb29c1ffa0c03 (diff)
am 902cb106: am cf471efd: am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev
* commit '902cb106fe8d06274462e4cea4afb29c1ffa0c03': Mask IccId which gets printed in bug reports & radio logs.
-rw-r--r--telephony/java/android/telephony/SubscriptionInfo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 37ffa063c34f..e11c8d3acc43 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -334,7 +334,8 @@ public class SubscriptionInfo implements Parcelable {
@Override
public String toString() {
- return "{id=" + mId + ", iccId=" + mIccId + " simSlotIndex=" + mSimSlotIndex
+ String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
+ return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
+ " displayName=" + mDisplayName + " carrierName=" + mCarrierName
+ " nameSource=" + mNameSource + " iconTint=" + mIconTint
+ " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc