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

Commit 66715cf4 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20104861



Change-Id: If5cd6fe09a65e3077aa3caea0f4fb7ce6e64f184
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd8ffe17 ff536d15

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

        }