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

Commit 9081e76d authored by Cassie's avatar Cassie
Browse files

Change isEuicc to !isRemovable. 

Bug: 124787559
Test: manual
Change-Id: Ie918f9bfaab3f27d11690f9bd9de7e79afd2f2da
parent 0a50e909

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class EuiccCardController extends IEuiccCardController.Stub { 
        }

        for (int i = 0; i < slots.length; ++i) {

            UiccSlot slotInfo = slots[i];

            if (slotInfo.isEuicc() && slotInfo.isActive()) {

            if (!slotInfo.isRemovable() && slotInfo.isActive()) {

                return true;

            }

        }

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccCardControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -98,8 +98,10 @@ public class EuiccCardControllerTest extends TelephonyTest { 
        when(mActivatedEsimSlot.isActive()).thenReturn(true);

        when(mInactivatedEsimSlot.isEuicc()).thenReturn(true);

        when(mInactivatedEsimSlot.isActive()).thenReturn(false);

        when(mInactivatedEsimSlot.isRemovable()).thenReturn(false);

        when(mActivatedRemovableSlot.isEuicc()).thenReturn(false);

        when(mActivatedRemovableSlot.isActive()).thenReturn(true);

        when(mActivatedRemovableSlot.isRemovable()).thenReturn(true);

    }



    @After