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

Commit f346ea15 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
Merged-In: I4a16a37233f696e7869427a98b8f385372036bc9
parent 46dbee08

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

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

        }





        private void updateNrAdvancedState() {

        private void updateNrAdvancedState() {

            if (!isNrConnected()) {

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

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

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

                sendMessage(EVENT_NR_STATE_CHANGED);

                sendMessage(EVENT_NR_STATE_CHANGED);

                return;

                return;

            }

            }

            if (!isNrAdvanced()) {

            boolean isNrAdvanced = isNrAdvanced();

            if (isNrAdvanced != mIsNrAdvanced) {

                if (!isNrAdvanced) {

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

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

                    transitionWithTimerTo(mNrConnectedState);

                    transitionWithTimerTo(mNrConnectedState);

                } else {

                } else {

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

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

                    transitionTo(mNrConnectedState);

                    transitionTo(mNrConnectedState);

                }

                }

            }

            mIsNrAdvanced = isNrAdvanced();

            mIsNrAdvanced = isNrAdvanced();

        }

        }