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

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

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

Do not merge since this issue is fixed in internal master after separating 5G and 5G+ into different states.

Test: atest NetworkTypeControllerTest
Test: manual verify
Bug: 258572870
Change-Id: I4bab4feb6ff756ea29a286f16f981931fa3fdfbb
parent 5a5a8e68

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) {