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

Commit 7ff66858 authored by chen xu's avatar chen xu Committed by Chen Xu
Browse files

no need to resolve carrier in sim locked state 

1. skip resolve sim carrier id as no records loaded in this stage.
2. treat SIM error same as sim absent for carrier identification.

Bug: 110559381
Test: manual test
Change-Id: I208ff037647a51cd46509e06c5faa50a8a7b736f
parent bc5ebc6f

src/java/com/android/internal/telephony/CarrierResolver.java

+1 −2
Original line number Diff line number Diff line
@@ -135,12 +135,11 @@ public class CarrierResolver extends Handler { 
        logd("[resolveSubscriptionCarrierId] simState: " + simState);

        switch (simState) {

            case IccCardConstants.INTENT_VALUE_ICC_ABSENT:

            case IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR:

                // only clear carrier id on absent to avoid transition to unknown carrier id during

                // intermediate states of sim refresh

                handleSimAbsent();

                break;

            case IccCardConstants.INTENT_VALUE_ICC_LOCKED:

                // intentional fall through from above case, treat locked same as loaded

            case IccCardConstants.INTENT_VALUE_ICC_LOADED:

                handleSimLoaded();

                break;