Merge "Implement getUiccCardsInfo API" am: 69fac807b1
am: 55d4d64105
Change-Id: I9791a467ceea41cfa528e3c00175e028f73825a6
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8d71cb5..269c0f5 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;
@@ -5670,6 +5671,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");