commit 65a606481bda57d5c9aafaf533748d6226f4cb8d
author Jordan Liu <jminjie@google.com> Mon Oct 14 15:41:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 14 15:41:01 2019 -0700
tree c323355561fd0823d29d50ff6251d7149186c27f
parent 636a4a31bf264ac1485809651804380428cd1eaa
parent ac4e112fb7bd3ddc0d8efcea37cab12a01a73502

Merge "Use UiccSlot.getEid as cardId"
am: ac4e112fb7

Change-Id: Ieb15d0cbb56c4940f19c6e1320e85971e76c3136

src/com/android/phone/PhoneInterfaceManager.java

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