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

Commit f6bcb081 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

Change-Id: If2e6b410e9c59ed0bdfae2664b2b13a4545a0e7f
parents dd918d7c db22faf8

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

+2 −2
Original line number Diff line number Diff line
@@ -956,8 +956,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;