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

Commit 65529f7e authored by Sarah Chin's avatar Sarah Chin
Browse files

Don't transition to current state after changing preferred network mode 

Test: atest NetworkTypeControllerTest
Fix: 172300683
Change-Id: If18dea68bd64d5330324d63ba9d270ac875f82c3
parent 525bbd6b

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -506,7 +506,8 @@ public class NetworkTypeController extends StateMachine { 
                    break;

                    break;

                case EVENT_PREFERRED_NETWORK_MODE_CHANGED:

                case EVENT_PREFERRED_NETWORK_MODE_CHANGED:

                    resetAllTimers();

                    resetAllTimers();

                    transitionToCurrentState();

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

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

                    break;

                    break;

                default:

                default:

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

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

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

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




        mNetworkTypeController.sendMessage(EVENT_PREFERRED_NETWORK_MODE_CHANGED);

        mNetworkTypeController.sendMessage(EVENT_PREFERRED_NETWORK_MODE_CHANGED);

        processAllMessages();

        processAllMessages();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA,

                mNetworkTypeController.getOverrideNetworkType());



        mNetworkTypeController.sendMessage(EVENT_DATA_RAT_CHANGED);

        processAllMessages();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());

                mNetworkTypeController.getOverrideNetworkType());

    }

    }