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

Commit b3d4478c authored by Sarah Chin's avatar Sarah Chin
Browse files

NR advanced state check for NR SA 

Prevent the early return when NR state is not connected in NR SA mode
and update NR advanced state properly.
Fix redundant logs for NR Connected <-> NR Advanced transitions.

Test: NetworkTypeControllerTest
Test: manual test modifying carrier configs
Bug: 249173396
Change-Id: I4a16a37233f696e7869427a98b8f385372036bc9
parent 5557c28a

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

+10 −7
Original line number Diff line number Diff line
@@ -979,18 +979,21 @@ public class NetworkTypeController extends StateMachine { 


        private void updateNrAdvancedState() {

            log("updateNrAdvancedState");

            if (!isNrConnected()) {

            if (!isNrConnected() && getDataNetworkType() != TelephonyManager.NETWORK_TYPE_NR) {

                log("NR state changed. Sending EVENT_NR_STATE_CHANGED");

                sendMessage(EVENT_NR_STATE_CHANGED);

                return;

            }

            if (!isNrAdvanced()) {

            boolean isNrAdvanced = isNrAdvanced();

            if (isNrAdvanced != mIsNrAdvanced) {

                if (!isNrAdvanced) {

                    if (DBG) log("updateNrAdvancedState: CONNECTED_NR_ADVANCED -> CONNECTED");

                    transitionWithTimerTo(mNrConnectedState);

                } else {

                    if (DBG) log("updateNrAdvancedState: CONNECTED -> CONNECTED_NR_ADVANCED");

                    transitionTo(mNrConnectedState);

                }

            }

            mIsNrAdvanced = isNrAdvanced();

            log("mIsNrAdvanced=" + mIsNrAdvanced);

        }