diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-11-03 01:52:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-03 01:52:13 +0000 |
| commit | 71f018a411c55383f395adc52d8363d6103529d3 (patch) | |
| tree | 1366eff739e860f6023a3009502aae8d87d5e20c /telephony | |
| parent | 157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e (diff) | |
| parent | b57c65b00efbcc6c8ed5a64b2c314dbca72d5554 (diff) | |
| download | frameworks_base-71f018a411c55383f395adc52d8363d6103529d3.zip frameworks_base-71f018a411c55383f395adc52d8363d6103529d3.tar.gz frameworks_base-71f018a411c55383f395adc52d8363d6103529d3.tar.bz2 | |
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am: b57c65b00e
* commit 'b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
Fix a crash while printing ICCID because of alphabets in UICC.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionInfo.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index e11c8d3..d1d6e0d 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -332,9 +332,24 @@ public class SubscriptionInfo implements Parcelable { return 0; } + /** + * @hide + */ + public static String givePrintableIccid(String iccId) { + String iccIdToPrint = null; + if (iccId != null) { + if (iccId.length() > 9) { + iccIdToPrint = iccId.substring(0, 9) + "XXXXXXXXXXX"; + } else { + iccIdToPrint = iccId; + } + } + return iccIdToPrint; + } + @Override public String toString() { - String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null; + String iccIdToPrint = givePrintableIccid(mIccId); return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex + " displayName=" + mDisplayName + " carrierName=" + mCarrierName + " nameSource=" + mNameSource + " iconTint=" + mIconTint |