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

Commit bf0c8775 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Treat slot idx used for remote sim as valid where needed."

parents ab0d6d1c ee769f5a

src/java/com/android/internal/telephony/SubscriptionController.java

+4 −3
Original line number Diff line number Diff line
@@ -1772,9 +1772,10 @@ public class SubscriptionController extends ISub.Stub { 
            if (VDBG) logd("[getSubId] map default slotIndex=" + slotIndex);

        }



        // Check that we have a valid slotIndex

        // TODO b/123300875 This check should probably be removed once tests are fixed

        if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {

        // Check that we have a valid slotIndex or the slotIndex is for a remote SIM (remote SIM

        // uses special slot index that may be invalid otherwise)

        if (!SubscriptionManager.isValidSlotIndex(slotIndex)

                && slotIndex != SubscriptionManager.SLOT_INDEX_FOR_REMOTE_SIM_SUB) {

            if (DBG) logd("[getSubId]- invalid slotIndex=" + slotIndex);

            return null;

        }