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

Commit faa0eddc authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev

parents c724e059 506c3df5

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

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ public class UiccSlotUtil { 
                    }

                    return true;

                })

                .sorted(Comparator.comparingInt(UiccSlotMapping::getLogicalSlotIndex))

                .mapToInt(uiccSlotMapping -> uiccSlotMapping.getLogicalSlotIndex())

                .findFirst()

                .orElse(INVALID_LOGICAL_SLOT_ID);

tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java

+51 −3
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ public class UiccSlotUtilTest { 
    @Test

    public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsAToPsimAndPort0_logicalSlot1() {

        // There is only one enabled esimPort0 before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingPsimAndPort1();

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsA();

        Collection<SubscriptionInfo> activeSubscriptionInfoList =

                createActiveSubscriptionInfoListOneSim(0, 0);

        SubscriptionInfo removedSubInfo = null;
@@ -469,7 +469,7 @@ public class UiccSlotUtilTest { 
    @Test

    public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsBToPsimAndPort1_logicalSlot1() {

        // There is only one enabled esimPort1 before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingPsimAndPort1();

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsB();

        Collection<SubscriptionInfo> activeSubscriptionInfoList =

                createActiveSubscriptionInfoListOneSim(0, 1);

        SubscriptionInfo removedSubInfo = null;
@@ -484,7 +484,7 @@ public class UiccSlotUtilTest { 
    @Test

    public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsBToPsimAndPort0_logicalSlot0() {

        // There is only one enabled esimPort0 before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingPsimAndPort1();

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsB();

        Collection<SubscriptionInfo> activeSubscriptionInfoList =

                createActiveSubscriptionInfoListOneSim(1, 0);

        SubscriptionInfo removedSubInfo = null;
@@ -552,6 +552,48 @@ public class UiccSlotUtilTest { 
        assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex);

    }



    @Test

    public void getExcludedLogicalSlotIndex_noEsimAndFromDualPortsAToPsimAndPort1_logicalSlot0() {

        // There is no profiles enabled on either esim port before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsA();

        Collection<SubscriptionInfo> activeSubscriptionInfoList = new ArrayList<>();

        SubscriptionInfo removedSubInfo = null;

        int verifyExcludedLogicalSlotIndex = 0;



        int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex(

                uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true);



        assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex);

    }



    @Test

    public void getExcludedLogicalSlotIndex_noEsimAndFromDualPortsBToPsimAndPort0_logicalSlot0() {

        // There is no profiles enabled on either esim port before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsB();

        Collection<SubscriptionInfo> activeSubscriptionInfoList = new ArrayList<>();

        SubscriptionInfo removedSubInfo = null;

        int verifyExcludedLogicalSlotIndex = 0;



        int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex(

                uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true);



        assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex);

    }



    @Test

    public void getExcludedLogicalSlotIndex_noEsimNoOrdingFromDualPortsBToPsimAndPort1_logical0() {

        // There is no profiles enabled on either esim port before user enables the psim.

        Collection<UiccSlotMapping> uiccSlotMappings = createUiccSlotMappingDualPortsBNoOrding();

        Collection<SubscriptionInfo> activeSubscriptionInfoList = new ArrayList<>();

        SubscriptionInfo removedSubInfo = null;

        int verifyExcludedLogicalSlotIndex = 0;



        int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex(

                uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true);



        assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex);

    }



    private void compareTwoUiccSlotMappings(Collection<UiccSlotMapping> testUiccSlotMappings,

            Collection<UiccSlotMapping> verifyUiccSlotMappings) {

        assertThat(testUiccSlotMappings.size()).isEqualTo(verifyUiccSlotMappings.size());
@@ -656,7 +698,13 @@ public class UiccSlotUtilTest { 


        return slotMap;

    }

    private List<UiccSlotMapping> createUiccSlotMappingDualPortsBNoOrding() {

        List<UiccSlotMapping> slotMap = new ArrayList<>();

        slotMap.add(new UiccSlotMapping(0, ESIM_PHYSICAL_SLOT, 1));

        slotMap.add(new UiccSlotMapping(1, ESIM_PHYSICAL_SLOT, 0));



        return slotMap;

    }

    /**

     * The "oneSimSlotDevice" has below cases

     * 1) The device is one psim slot and no esim slot