commit 79cfb02cb2295700eff2d3a5b988d56b276d793e
author Jordan Liu <jminjie@google.com> Fri Apr 26 12:27:39 2019 -0700
committer Jordan Liu <jminjie@google.com> Wed May 01 17:27:56 2019 +0000
tree ed17fccc80d3b1af759fe939cfac6af579e9226a
parent 246018c09759710466ca1a20899e7d1e88b3a97e

Fix UiccSlotInfo.getCardId for inactive eUICC

This was incorrectly returning the ICCID. Now we will return null.

Test: manual and atest TelephonyManagerTest#testGetUiccSlotsInfo
Bug: 131423779
Change-Id: I8cb4ce7779884d6b9b21aa378e9794fb20d230d9
(cherry picked from commit cdb04cd4184c39df067c8524c579e727fbf159ce)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 18911ef..df589fd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6365,11 +6365,11 @@
                     continue;
                 }
 
-                String cardId;
+                String cardId = null;
                 UiccCard card = slot.getUiccCard();
                 if (card != null) {
                     cardId = card.getCardId();
-                } else {
+                } else if (!slot.isEuicc()) {
                     cardId = slot.getIccId();
                 }