commit edb3e72229eb621733f15091bfe85c62bf64f983
author Sanket Padawe <sanketpadawe@google.com> Mon Nov 02 15:45:52 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Nov 03 14:35:19 2015 -0800
tree ca884b6fe280f9360a6fbc3c86dcc21766b23111
parent 09ee5a47c2f47859e0a63f0c05a26c8cee34f28a

Fix a crash while printing ICCID because of alphabets in UICC.

Bug: 25401769
Change-Id: Ibe521237989b7f640cafcf8c21a5b8ff6b87d723

src/java/com/android/internal/telephony/SubscriptionController.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 351783b..d4152b5 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -287,7 +287,7 @@
         String countryIso = getSubscriptionCountryIso(id);
 
         if (DBG) {
-            String iccIdToPrint = iccId != null ? iccId.substring(0, 9) + "XXXXXXXXXXX" : null;
+            String iccIdToPrint = SubscriptionInfo.givePrintableIccid(iccId);
             logd("[getSubInfoRecord] id:" + id + " iccid:" + iccIdToPrint + " simSlotIndex:" + simSlotIndex
                 + " displayName:" + displayName + " nameSource:" + nameSource
                 + " iconTint:" + iconTint + " dataRoaming:" + dataRoaming

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 7bbf324..4d522a5 100644
--- a/src/java/com/android/internal/telephony/uicc/IccRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java
@@ -26,6 +26,7 @@
 import android.telephony.Rlog;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.telephony.SubscriptionInfo;
 
 import com.android.internal.telephony.CommandsInterface;
 import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
@@ -115,7 +116,7 @@
 
     @Override
     public String toString() {
-        String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
+        String iccIdToPrint = SubscriptionInfo.givePrintableIccid(mIccId);
         return "mDestroyed=" + mDestroyed
                 + " mContext=" + mContext
                 + " mCi=" + mCi
@@ -719,7 +720,8 @@
         pw.println(" mRecordsRequested=" + mRecordsRequested);
         pw.println(" mRecordsToLoad=" + mRecordsToLoad);
         pw.println(" mRdnCache=" + mAdnCache);
-        String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null;
+        String iccIdToPrint = SubscriptionInfo.givePrintableIccid(mIccId);
+
         pw.println(" iccid=" + iccIdToPrint);
         if (TextUtils.isEmpty(mMsisdn)) {
             pw.println(" mMsisdn=null");