commit 39f7a678db006a3e30ecb2e015fd2a0f5bf137f2
author Jordan Liu <jminjie@google.com> Mon May 06 16:51:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 06 16:51:24 2019 -0700
tree 34af586c40c026f602c1e114177f485701ec52f9
parent 84b34618358297625a5b6b8c1cfb0ba015d6c06c
parent a2a9c215573f968a41f2c1da8005a9f27db93e9d

Merge "Revert "Fix UiccSlotInfo.getCardId for inactive eUICC"" into qt-dev am: 72de2f39aa
am: a2a9c21557

Change-Id: I71646389c6e5eb7b20bd1b55715e2d600703fa60

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d1331af..495bee3 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6400,11 +6400,11 @@
                     continue;
                 }
 
-                String cardId = null;
+                String cardId;
                 UiccCard card = slot.getUiccCard();
                 if (card != null) {
                     cardId = card.getCardId();
-                } else if (!slot.isEuicc()) {
+                } else {
                     cardId = slot.getIccId();
                 }