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

Commit ff536d15 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "NR advanced state check for NR SA" into tm-qpr-dev

parents 1288b573 f346ea15

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

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



        private void 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();

        }