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

Commit d3a7c754 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge changes Ic2ac6a5c,I47dc068e 

* changes:
  [MEP] The removale slot can read the esim card
  Changing the condition since the esim may be removable
parents e5a21d34 7d71d3f4

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

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class UiccSlotUtil { 
                            if (slotInfo == null) {

                                return false;

                            }

                            return !slotInfo.isRemovable();

                            return slotInfo.getIsEuicc();

                        })

                .findFirst().orElse(-1);

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

+14 −0
Original line number Diff line number Diff line
@@ -92,6 +92,14 @@ public class UiccSlotUtilTest { 


        assertThat(testSlot).isEqualTo(0);

    }

    @Test

    public void getEsimSlotId_twoSimSlotsDeviceAndRemovableEsimIsSlot1_returnTheCorrectEsimSlot() {

        when(mTelephonyManager.getUiccSlotsInfo()).thenReturn(

                twoSimSlotsDeviceActivePsimActiveRemovableEsim());

        int testSlot = UiccSlotUtil.getEsimSlotId(mContext);



        assertThat(testSlot).isEqualTo(1);

    }



    @Test

    public void getEsimSlotId_twoSimSlotsDeviceAndEsimIsSlot1_returnTheCorrectEsimSlot() {
@@ -729,6 +737,12 @@ public class UiccSlotUtilTest { 
                createUiccSlotInfo(true, false, 1, true)};

    }



    private UiccSlotInfo[] twoSimSlotsDeviceActivePsimActiveRemovableEsim() {

        return new UiccSlotInfo[]{

                createUiccSlotInfo(false, true, 0, true),

                createUiccSlotInfo(true, true, 1, true)};

    }



    private UiccSlotInfo[] twoSimSlotsDeviceActiveEsimActivePsim() {

        return new UiccSlotInfo[]{

                createUiccSlotInfo(true, false, 0, true),