commit c8f9efad877ea21679ca44e35684e90cc2a1fdfc
author Jordan Liu <jminjie@google.com> Mon Oct 14 15:53:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 14 15:53:16 2019 -0700
tree 2a59117613042efcb5117faf88cf03766a1ab448
parent 3829f323f0486252f193cc6b4f80624193aa8f73
parent 65a606481bda57d5c9aafaf533748d6226f4cb8d

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

Change-Id: Ic5cd82585cac4803a6f095e44ac6f27ea57f1aee

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) {