Merge "Transition to current state on preferred network type changed" (be75c2e3) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -454,6 +454,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;
		@@ -513,11 +514,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);
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -368,11 +368,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());
		}