commit 72de2f39aa1b4d0e94b6d9b5988b78b27b038a5d
author Jordan Liu <jminjie@google.com> Mon May 06 23:14:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 06 23:14:35 2019 +0000
tree c0ea365249fd49dd711db547fac4ba719d5b9d86
parent 698a1ed77340b5f421e9ea7d123f2da19ebce8ed
parent 7be7e65784a1709397cf038a92c10a7c954359ab

Merge "Revert "Fix UiccSlotInfo.getCardId for inactive eUICC"" into qt-dev

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();
                 }