commit 69fac807b19643d88d7842c1c5f24bbf7b6189fa
author Jordan Liu <jminjie@google.com> Wed Dec 26 16:16:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 26 16:16:02 2018 +0000
tree b0418ef9200079f91e4becedb8990594f2e748c5
parent fda37c33c328e9da368ce27642c3a41402719f57
parent 5aa0700301079603bebb73e79d1fbea16e5158e9

Merge "Implement getUiccCardsInfo API"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 71864ab..a8f72bc 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -78,6 +78,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyHistogram;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.UssdResponse;
 import android.telephony.VisualVoicemailSmsFilterSettings;
@@ -5650,6 +5651,19 @@
     }
 
     @Override
+    public UiccCardInfo[] getUiccCardsInfo() {
+        enforceReadPrivilegedPermission("getUiccCardsInfo");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ArrayList<UiccCardInfo> cards = UiccController.getInstance().getAllUiccCardInfos();
+            return cards.toArray(new UiccCardInfo[cards.size()]);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
     public UiccSlotInfo[] getUiccSlotsInfo() {
         enforceReadPrivilegedPermission("getUiccSlotsInfo");