| commit | 857451f9edf422ab2660793f2e8f1075d37920e5 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Thu May 09 16:35:35 2019 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Mon May 13 18:12:54 2019 +0000 |
| tree | ef071ea6dc04c167d902ed757456d6dcf205de33 | |
| parent | 17b6a1a9876ceabfdf71ec30e2c4fd9ef92ec38e [diff] |
Strip trailing F in UiccSlotInfo Test: manual Bug: 132378071 Change-Id: Ic627208ef430ad73f46cdc56c0d031cdd2c3ce7e
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index bdf66df..02e72c6 100755 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6384,6 +6384,12 @@ cardId = slot.getIccId(); } + if (cardId != null) { + // if cardId is an ICCID, strip off trailing Fs before exposing to user + // if cardId is an EID, it's all digits so this is fine + cardId = IccUtils.stripTrailingFs(cardId); + } + int cardState = 0; switch (slot.getCardState()) { case CARDSTATE_ABSENT: