Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev

Browse Source 
am: b57c65b00e

* commit 'b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
  Fix a crash while printing ICCID because of alphabets in UICC.
This commit is contained in:
Sanket Padawe
2015-11-03 01:52:13 +00:00
committed by android-build-merger
parent 157e60f7a2 b57c65b00e
commit 71f018a411
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -332,9 +332,24 @@ public class SubscriptionInfo implements Parcelable {
return 0; 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 @Override
public String toString() { public String toString() {
String iccIdToPrint = mIccId != null ? mIccId.substring(0, 9) + "XXXXXXXXXXX" : null; String iccIdToPrint = givePrintableIccid(mIccId);
return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex return "{id=" + mId + ", iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
+ " displayName=" + mDisplayName + " carrierName=" + mCarrierName + " displayName=" + mDisplayName + " carrierName=" + mCarrierName
+ " nameSource=" + mNameSource + " iconTint=" + mIconTint + " nameSource=" + mNameSource + " iconTint=" + mIconTint