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

Commit 58d5665d authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Invalid card ID should map to invalid slot" 

am: 136e243c

Change-Id: I0c2c79c6247d509dcd956ba91e5f8328b0072ab0
parents 4b836529 136e243c

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

+3 −0
Original line number Diff line number Diff line
@@ -954,6 +954,9 @@ public class EuiccConnector extends StateMachine implements ServiceConnection { 
     * Gets the slot ID from the card ID.

     */

    private int getSlotIdFromCardId(int cardId) {

        if (cardId == TelephonyManager.INVALID_CARD_ID) {

            return SubscriptionManager.INVALID_SIM_SLOT_INDEX;

        }

        TelephonyManager tm = (TelephonyManager)

                mContext.getSystemService(Context.TELEPHONY_SERVICE);

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