commit 01bd00dc1cffbb15e65471ed0408a0aa89d4e5aa
author Jordan Liu <jminjie@google.com> Thu Sep 12 16:19:43 2019 -0700
committer Jordan Liu <jminjie@google.com> Fri Sep 13 00:55:25 2019 +0000
tree 6ac8a3bd6c545c639f9c56bf44c37f60a93d2060
parent dd0e3cb5b13ecaf6685e1ced020d204d1b9fe0c0

Use UiccSlot.getEid as cardId

Bug: 140454770
Test: manual
Change-Id: I0897046386e155e32f2f98effa1654a7b81bd340

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3e6c041..7b9689a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6516,7 +6516,10 @@
                 if (card != null) {
                     cardId = card.getCardId();
                 } else {
-                    cardId = slot.getIccId();
+                    cardId = slot.getEid();
+                    if (TextUtils.isEmpty(cardId)) {
+                        cardId = slot.getIccId();
+                    }
                 }
 
                 int cardState = 0;