commit a2f4ac77fa53b91c8547228f9521ca7411abaa0f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 15 00:24:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 00:24:19 2019 +0000
tree fb728533df8d2166c8a5030ed03a2f970eea5d0d
parent 65a606481bda57d5c9aafaf533748d6226f4cb8d
parent f07d3715130ce6e2485f1a899793af5c56be445c

Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master

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