commit 7a580e32ba7c4b1c371c7662e8c30f5b8c41ce1e
author Jordan Liu <jminjie@google.com> Tue Jan 08 20:23:36 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 08 20:23:36 2019 +0000
tree 40a0910b5ed1c9dedd210981fb566f22b357674f
parent 805b5ca64ba64447e0284140e07441ccc81bed3b
parent a8eb4c65a146bf48833e6d6aa71ab283a5c79719

Merge "Strip trailing Fs off raw ICCID"

src/java/com/android/internal/telephony/uicc/UiccController.java

diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java
index 6b15ebc..b018221 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccController.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccController.java
@@ -559,8 +559,11 @@
 
         UiccCard card = mUiccSlots[slotId].getUiccCard();
         if (card != null && (card.getCardState() == CardState.CARDSTATE_PRESENT)) {
-            // Card.getCardId returns the cardString, not the public card ID int
             String cardString = card.getCardId();
+            if (!mUiccSlots[slotId].isEuicc()) {
+                // getCardId() returns the raw ICCID for a UICC, so we strip it manually
+                cardString = IccUtils.stripTrailingFs(cardString);
+            }
             addCardId(cardString);
         }