commit 497d54c0f337bd71165122d2e2c54ec826f4fb17
author Sanket Padawe <sanketpadawe@google.com> Thu Oct 15 15:43:24 2015 -0700
committer Sanket Padawe <sanketpadawe@google.com> Thu Oct 15 15:43:24 2015 -0700
tree 119a0a382d6a26a5ffe0e2d2864a5ce27497f0cf
parent edd4a385f41a7fb765c0cbbc19b0fa6c0b2a1281

Mask IccId which gets printed in bug reports & radio logs.

Bug: 24941148
Change-Id: Ic26c657529def04cdd34cfd9d78a35ae3ef52d15

src/java/com/android/internal/telephony/uicc/IccRecords.java

diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java
index d91c4e7..1e814a6 100644
--- a/src/java/com/android/internal/telephony/uicc/IccRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java
@@ -111,6 +111,7 @@
 
     @Override
     public String toString() {
+        String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
         return "mDestroyed=" + mDestroyed
                 + " mContext=" + mContext
                 + " mCi=" + mCi
@@ -125,7 +126,7 @@
                 + " recordsToLoad=" + mRecordsToLoad
                 + " adnCache=" + mAdnCache
                 + " recordsRequested=" + mRecordsRequested
-                + " iccid=" + mIccId
+                + " iccid=" + iccIdToPrint
                 + " msisdnTag=" + mMsisdnTag
                 + " voiceMailNum=" + mVoiceMailNum
                 + " voiceMailTag=" + mVoiceMailTag
@@ -714,7 +715,8 @@
         pw.println(" mRecordsRequested=" + mRecordsRequested);
         pw.println(" mRecordsToLoad=" + mRecordsToLoad);
         pw.println(" mRdnCache=" + mAdnCache);
-        pw.println(" iccid=" + mIccId);
+        String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
+        pw.println(" iccid=" + iccIdToPrint);
         if (TextUtils.isEmpty(mMsisdn)) {
             pw.println(" mMsisdn=null");
         } else {