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

Commit 6ea7a08b authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Manually set destination state for 5G+ to 5G transition am: fb8d53dc 

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



Change-Id: Ie8a97e98be68a7bc1b6bc50c690b64bd939d7f9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10b39051 fb8d53dc

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

+5 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ public class NetworkTypeController extends StateMachine { 
            if (isNrAdvanced != mIsNrAdvanced) {

                if (!isNrAdvanced) {

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

                    transitionWithTimerTo(mNrConnectedState);

                    transitionWithTimerTo(mNrConnectedState, STATE_CONNECTED);

                } else {

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

                    transitionTo(mNrConnectedState);
@@ -1029,7 +1029,10 @@ public class NetworkTypeController extends StateMachine { 
    private final NrConnectedState mNrConnectedState = new NrConnectedState();



    private void transitionWithTimerTo(IState destState) {

        String destName = destState.getName();

        transitionWithTimerTo(destState, destState.getName());

    }



    private void transitionWithTimerTo(IState destState, String destName) {

        if (DBG) log("Transition with primary timer from " + mPreviousState + " to " + destName);

        OverrideTimerRule rule = mOverrideTimerRules.get(mPreviousState);

        if (!mIsDeviceIdleMode && rule != null && rule.getTimer(destName) > 0) {