Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ebe0c66 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Update usage of UiccCardInfo API" am: f36c8bae am: db22faf8 

am: f6bcb081

Change-Id: Ibda2fc16f99e51216373e2e88a32e9a80d73c43e
parents dd09e69a f6bcb081

src/java/com/android/internal/telephony/euicc/EuiccConnector.java

+2 −2
Original line number Diff line number Diff line
@@ -958,8 +958,8 @@ public class EuiccConnector extends StateMachine implements ServiceConnection { 
    private int getSlotIdFromCardId(int cardId) {

        TelephonyManager tm = (TelephonyManager)

                mContext.getSystemService(Context.TELEPHONY_SERVICE);

        UiccCardInfo[] infos = tm.getUiccCardsInfo();

        if (infos == null) {

        List<UiccCardInfo> infos = tm.getUiccCardsInfo();

        if (infos == null || infos.size() == 0) {

            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;

        }

        int slotId = SubscriptionManager.INVALID_SIM_SLOT_INDEX;