diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-11-02 15:45:52 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-11-03 14:35:19 -0800 |
| commit | edb3e72229eb621733f15091bfe85c62bf64f983 (patch) | |
| tree | ca884b6fe280f9360a6fbc3c86dcc21766b23111 /src | |
| parent | 09ee5a47c2f47859e0a63f0c05a26c8cee34f28a (diff) | |
| download | android_frameworks_opt_telephony-edb3e72229eb621733f15091bfe85c62bf64f983.tar.gz android_frameworks_opt_telephony-edb3e72229eb621733f15091bfe85c62bf64f983.tar.bz2 android_frameworks_opt_telephony-edb3e72229eb621733f15091bfe85c62bf64f983.zip | |
Fix a crash while printing ICCID because of alphabets in UICC.
Bug: 25401769
Change-Id: Ibe521237989b7f640cafcf8c21a5b8ff6b87d723
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/internal/telephony/SubscriptionController.java | 2 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/IccRecords.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java index 351783b99..d4152b552 100644 --- a/src/java/com/android/internal/telephony/SubscriptionController.java +++ b/src/java/com/android/internal/telephony/SubscriptionController.java @@ -287,7 +287,7 @@ public class SubscriptionController extends ISub.Stub { 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 diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java index 7bbf324bd..4d522a55d 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.os.RegistrantList; 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 @@ public abstract class IccRecords extends Handler implements IccConstants { @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 @@ public abstract class IccRecords extends Handler implements IccConstants { 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"); |