commit 001a651e4b0919239f09b25ae99d132585b5d382
author Sanket Padawe <sanketpadawe@google.com> Fri Oct 16 00:41:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 16 00:41:44 2015 +0000
tree 3647170667b524b92412583232a12e87f93c6d7d
parent 510f03c5ac057122569264bd005b2e26f96236ae
parent 8d6d735fa8cea74f53ba29063b72b856fef69d8e

am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev

* commit '8d6d735fa8cea74f53ba29063b72b856fef69d8e':
  Mask IccId which gets printed in bug reports & radio logs.

telephony/java/android/telephony/SubscriptionInfo.java

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 37ffa06..e11c8d3 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -334,7 +334,8 @@
 
     @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