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

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

Merge "Don't transition to current state after changing preferred network... 

Merge "Don't transition to current state after changing preferred network mode" am: af220aef am: 7836bdc3 am: d0d707c1

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

Change-Id: I4bd74222234bd64e6161f1b236b030757cc493e8
parents 00fec27d d0d707c1

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

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

                case EVENT_PREFERRED_NETWORK_MODE_CHANGED:

                    resetAllTimers();

                    transitionToCurrentState();

                    // 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

+5 −0
Original line number Diff line number Diff line
@@ -350,6 +350,11 @@ 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());

    }