Snap for 7113391 from 45d34996eb7d4a7604f5dc27ca399d36ff781009 to rvc-qpr3-release (2f306651) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -352,11 +352,16 @@ public class NetworkTypeController extends StateMachine {

		private @Annotation.OverrideNetworkType int getCurrentOverrideNetworkType() {
		int displayNetworkType = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;
		int dataNetworkType = mPhone.getServiceState().getDataNetworkType();
		NetworkRegistrationInfo nri = mPhone.getServiceState().getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		int dataNetworkType = nri == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN
		: nri.getAccessNetworkTechnology();
		boolean nrNsa = isLte(dataNetworkType)
		&& mPhone.getServiceState().getNrState() != NetworkRegistrationInfo.NR_STATE_NONE;
		boolean nrSa = dataNetworkType == TelephonyManager.NETWORK_TYPE_NR;

		// NR display is not accurate when physical channel config notifications are off
		if (mIsPhysicalChannelConfigOn
		&& (mPhone.getServiceState().getNrState() != NetworkRegistrationInfo.NR_STATE_NONE
		\|\| dataNetworkType == TelephonyManager.NETWORK_TYPE_NR)) {
		if (mIsPhysicalChannelConfigOn && (nrNsa \|\| nrSa)) {
		// Process NR display network type
		displayNetworkType = getNrDisplayType();
		if (displayNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE) {

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

+17 −4

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.internal.telephony;

		import static org.junit.Assert.assertEquals;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.doReturn;

		import android.content.Intent;
		@@ -107,8 +108,6 @@ public class NetworkTypeControllerTest extends TelephonyTest {

		@Test
		public void testUpdateOverrideNetworkTypeNrNsa() throws Exception {
		doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

		// not NR
		doReturn(NetworkRegistrationInfo.NR_STATE_NONE).when(mServiceState).getNrState();
		updateOverrideNetworkType();
		@@ -143,8 +142,6 @@ public class NetworkTypeControllerTest extends TelephonyTest {

		@Test
		public void testUpdateOverrideNetworkTypeLte() throws Exception {
		doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

		// normal LTE
		updateOverrideNetworkType();
		assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,
		@@ -173,6 +170,22 @@ public class NetworkTypeControllerTest extends TelephonyTest {
		mNetworkTypeController.getOverrideNetworkType());
		}

		@Test
		public void testUpdateOverrideNetworkType() throws Exception {
		doReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED).when(mServiceState).getNrState();
		doReturn(ServiceState.FREQUENCY_RANGE_LOW).when(mServiceState).getNrFrequencyRange();
		NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
		.setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_HSPAP)
		.setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
		.build();
		doReturn(nri).when(mServiceState).getNetworkRegistrationInfo(anyInt(), anyInt());
		updateOverrideNetworkType();

		// override shouldn't be NR if not on LTE despite NR_STATE_CONNECTED
		assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,
		mNetworkTypeController.getOverrideNetworkType());
		}

		@Test
		public void testTransitionToCurrentStateLegacy() throws Exception {
		assertEquals("DefaultState", getCurrentState().getName());