Snap for 7135226 from e3dc5c48d0bbca276b9f1c3cb38329b0b3c26758 to rvc-qpr3-release (e74338c3) · Commits · e / os / android_frameworks_opt_telephony

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

+15 −11

Original line number	Diff line number	Diff line
		@@ -360,10 +360,7 @@ public class NetworkTypeController extends StateMachine {

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

		private @Annotation.OverrideNetworkType int getLteDisplayType() {
		int value = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE;
		if ((mPhone.getServiceState().getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE_CA
		if ((getDataNetworkType() == TelephonyManager.NETWORK_TYPE_LTE_CA
		\|\| mPhone.getServiceState().isUsingCarrierAggregation())
		&& (IntStream.of(mPhone.getServiceState().getCellBandwidths()).sum()
		> mLtePlusThresholdBandwidth)) {
		@@ -557,7 +554,7 @@ public class NetworkTypeController extends StateMachine {
		public boolean processMessage(Message msg) {
		if (DBG) log("LegacyState: process " + getEventName(msg.what));
		updateTimers();
		int rat = mPhone.getServiceState().getDataNetworkType();
		int rat = getDataNetworkType();
		switch (msg.what) {
		case EVENT_DATA_RAT_CHANGED:
		if (rat == TelephonyManager.NETWORK_TYPE_NR \|\| isLte(rat) && isNrConnected()) {
		@@ -633,7 +630,7 @@ public class NetworkTypeController extends StateMachine {
		updateTimers();
		switch (msg.what) {
		case EVENT_DATA_RAT_CHANGED:
		int rat = mPhone.getServiceState().getDataNetworkType();
		int rat = getDataNetworkType();
		if (rat == TelephonyManager.NETWORK_TYPE_NR) {
		transitionTo(mNrConnectedState);
		} else if (!isLte(rat) \|\| !isNrNotRestricted()) {
		@@ -700,7 +697,7 @@ public class NetworkTypeController extends StateMachine {
		updateTimers();
		switch (msg.what) {
		case EVENT_DATA_RAT_CHANGED:
		int rat = mPhone.getServiceState().getDataNetworkType();
		int rat = getDataNetworkType();
		if (rat == TelephonyManager.NETWORK_TYPE_NR) {
		transitionTo(mNrConnectedState);
		} else if (!isLte(rat) \|\| !isNrNotRestricted()) {
		@@ -768,7 +765,7 @@ public class NetworkTypeController extends StateMachine {
		public boolean processMessage(Message msg) {
		if (DBG) log("NrConnectedState: process " + getEventName(msg.what));
		updateTimers();
		int rat = mPhone.getServiceState().getDataNetworkType();
		int rat = getDataNetworkType();
		switch (msg.what) {
		case EVENT_DATA_RAT_CHANGED:
		if (rat == TelephonyManager.NETWORK_TYPE_NR \|\| isLte(rat) && isNrConnected()) {
		@@ -858,7 +855,7 @@ public class NetworkTypeController extends StateMachine {
		}

		private void transitionToCurrentState() {
		int dataRat = mPhone.getServiceState().getDataNetworkType();
		int dataRat = getDataNetworkType();
		IState transitionState;
		if (dataRat == TelephonyManager.NETWORK_TYPE_NR \|\| isNrConnected()) {
		transitionState = mNrConnectedState;
		@@ -911,7 +908,7 @@ public class NetworkTypeController extends StateMachine {
		resetAllTimers();
		}

		int rat = mPhone.getServiceState().getDataNetworkType();
		int rat = getDataNetworkType();
		if (!isLte(rat) && rat != TelephonyManager.NETWORK_TYPE_NR) {
		// Rat is 3G or 2G, and it doesn't need NR timer.
		resetAllTimers();
		@@ -1040,6 +1037,13 @@ public class NetworkTypeController extends StateMachine {
		return mPhysicalLinkState == DcController.PHYSICAL_LINK_ACTIVE;
		}

		private int getDataNetworkType() {
		NetworkRegistrationInfo nri = mPhone.getServiceState().getNetworkRegistrationInfo(
		NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
		return nri == null ? TelephonyManager.NETWORK_TYPE_UNKNOWN
		: nri.getAccessNetworkTechnology();
		}

		private String getEventName(int event) {
		try {
		return sEvents[event];

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −17

Original line number	Diff line number	Diff line
		@@ -727,6 +727,7 @@ public class DcTracker extends Handler {
		mHandlerThread.start();
		Handler dcHandler = new Handler(mHandlerThread.getLooper());
		mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager, dcHandler, mLogTagSuffix);
		mDcc.start();
		mDcTesterFailBringUpAll = new DcTesterFailBringUpAll(mPhone, dcHandler);

		mDataConnectionTracker = this;
		@@ -3940,7 +3941,7 @@ public class DcTracker extends Handler {
		onDataReconnect((ApnContext) msg.obj, msg.arg1);
		break;
		case DctConstants.EVENT_DATA_SERVICE_BINDING_CHANGED:
		onDataServiceBindingChanged((Boolean) ((AsyncResult) msg.obj).result);
		mDataServiceBound = (boolean) ((AsyncResult) msg.obj).result;
		break;
		case DctConstants.EVENT_DATA_ENABLED_CHANGED:
		ar = (AsyncResult) msg.obj;
		@@ -5218,22 +5219,6 @@ public class DcTracker extends Handler {
		.build();
		}

		private void onDataServiceBindingChanged(boolean bound) {
		if (bound) {
		if (mDcc == null) {
		mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager,
		new Handler(mHandlerThread.getLooper()), mLogTagSuffix);
		}
		mDcc.start();
		} else {
		mDcc.dispose();
		// dispose sets the associated Handler object (StateMachine#mSmHandler) to null, so mDcc
		// needs to be created again (simply calling start() on it after dispose will not work)
		mDcc = null;
		}
		mDataServiceBound = bound;
		}

		public static String requestTypeToString(@RequestNetworkType int type) {
		switch (type) {
		case REQUEST_TYPE_NORMAL: return "NORMAL";

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -723,7 +723,11 @@ public class NetworkTypeControllerTest extends TelephonyTest {
		assertTrue(mNetworkTypeController.is5GHysteresisActive());

		// rat is UMTS, should stop timer
		doReturn(TelephonyManager.NETWORK_TYPE_UMTS).when(mServiceState).getDataNetworkType();
		NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
		.setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_UMTS)
		.setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)
		.build();
		doReturn(nri).when(mServiceState).getNetworkRegistrationInfo(anyInt(), anyInt());
		doReturn(NetworkRegistrationInfo.NR_STATE_NONE).when(mServiceState).getNrState();
		mNetworkTypeController.sendMessage(EVENT_DATA_RAT_CHANGED);
		processAllMessages();