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

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

Merge "Transition to current state on preferred network type changed" into sc-dev

parents cd006259 460e56d8

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

+1 −5
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ public class NetworkTypeController extends StateMachine { 
            if (DBG) log("DefaultState: process " + getEventName(msg.what));

            switch (msg.what) {

                case EVENT_UPDATE:

                case EVENT_PREFERRED_NETWORK_MODE_CHANGED:

                    resetAllTimers();

                    transitionToCurrentState();

                    break;
@@ -539,11 +540,6 @@ public class NetworkTypeController extends StateMachine { 
                    resetAllTimers();

                    transitionTo(mLegacyState);

                    break;

                case EVENT_PREFERRED_NETWORK_MODE_CHANGED:

                    resetAllTimers();

                    // Don't transition to current state. If anything significant changes,

                    // a new broadcast will be sent to update the state then.

                    break;

                default:

                    throw new RuntimeException("Received invalid event: " + msg.what);

            }

tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

+0 −5
Original line number Diff line number Diff line
@@ -709,11 +709,6 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        mNetworkTypeController.sendMessage(EVENT_PREFERRED_NETWORK_MODE_CHANGED);

        processAllMessages();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA,

                mNetworkTypeController.getOverrideNetworkType());



        mNetworkTypeController.sendMessage(EVENT_DATA_RAT_CHANGED);

        processAllMessages();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());

    }