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

Commit a95cfc30 authored by Cassie's avatar Cassie Committed by Pengquan Meng
Browse files

Change isEuicc to !isRemovable. 

Bug: 124787559
Test: manual
Merged-In: Ie918f9bfaab3f27d11690f9bd9de7e79afd2f2da
Change-Id: Ie918f9bfaab3f27d11690f9bd9de7e79afd2f2da
(cherry picked from commit 9081e76d)
parent 1f520cee

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

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

        }

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

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

            UiccSlot slotInfo = slots[i];

            UiccSlot slotInfo = slots[i];

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

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

                return true;

                return true;

            }

            }

        }

        }

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -105,8 +105,10 @@ public class EuiccCardControllerTest extends TelephonyTest { 
        when(mNotPresentEsimSlot.getCardState()).thenReturn(CardState.CARDSTATE_ERROR);

        when(mNotPresentEsimSlot.getCardState()).thenReturn(CardState.CARDSTATE_ERROR);

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

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

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

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

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

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

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

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

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

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

    }

    }





    @After

    @After