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

Commit affe5406 authored by SongFerngWang's avatar SongFerngWang Committed by SongFerng Wang
Browse files

Mainline: removed legacy UI for network selection mode. 

This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.

Bug: 147128878
Test: build pass
Change-Id: I1a0f431f05268d29afce145c3eb720594cfc57a3
parent 69a7e054

src/com/android/settings/network/SubscriptionUtil.java

+1 −18
Original line number Diff line number Diff line
@@ -115,26 +115,9 @@ public class SubscriptionUtil { 
            return null;

        }



        if (subInfo.isEmbedded()) {

        return subInfo;

    }



        // Look for physical SIM which presented in slots no mater active or not.

        final UiccSlotInfo[] slotsInfo = getUiccSlotsInfo(context);

        if (slotsInfo == null) {

            return null;

        }

        for (UiccSlotInfo slotInfo : slotsInfo) {

            if ((!slotInfo.getIsEuicc())

                    && (slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT)

                    && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())

                    && TextUtils.equals(slotInfo.getCardId(), subInfo.getCardString())) {

                return subInfo;

            }

        }

        return null;

    }



    private static UiccSlotInfo [] getUiccSlotsInfo(Context context) {

        final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);

        return telMgr.getUiccSlotsInfo();