commit d96b52936734fc748d36d971b6fd8d59f6958fc4
author Jordan Liu <jminjie@google.com> Thu Sep 12 16:19:43 2019 -0700
committer Jordan Liu <jminjie@google.com> Mon Oct 14 14:22:31 2019 -0700
tree 5d1c9293722bc3322d0b9379a95fa49237fec74f
parent c078236fafb0a1c78a619dc590481c40dce1c8c7

Use UiccSlot.getEid as cardId

Bug: 140454770
Test: manual
Change-Id: I0897046386e155e32f2f98effa1654a7b81bd340
Merged-In: I0897046386e155e32f2f98effa1654a7b81bd340

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 17a887d..466a062 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6456,7 +6456,10 @@
                 if (card != null) {
                     cardId = card.getCardId();
                 } else {
-                    cardId = slot.getIccId();
+                    cardId = slot.getEid();
+                    if (TextUtils.isEmpty(cardId)) {
+                        cardId = slot.getIccId();
+                    }
                 }
 
                 if (cardId != null) {