Merge "Use tcp buffer values for rat LTE_CA" into rvc-dev am: c5e33bb15e am: 45cd95ea58 (3c10b4e9) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -3226,7 +3226,13 @@ public class ServiceStateTracker extends Handler {
		: TelephonyManager.NETWORK_TYPE_UNKNOWN;
		int newRAT = newNrs != null ? newNrs.getAccessNetworkTechnology()
		: TelephonyManager.NETWORK_TYPE_UNKNOWN;
		hasRilDataRadioTechnologyChanged.put(transport, oldRAT != newRAT);

		boolean isOldCA = oldNrs != null ? (oldNrs.getDataSpecificInfo() != null
		? oldNrs.getDataSpecificInfo().isUsingCarrierAggregation() : false) : false;
		boolean isNewCA = newNrs != null ? (newNrs.getDataSpecificInfo() != null
		? newNrs.getDataSpecificInfo().isUsingCarrierAggregation() : false) : false;

		hasRilDataRadioTechnologyChanged.put(transport, oldRAT != newRAT \|\| isOldCA != isNewCA);
		if (oldRAT != newRAT) {
		anyDataRatChanged = true;
		}

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -1025,13 +1025,14 @@ public class DataConnection extends StateMachine {
		"122334,734003,2202010,32040,192239,576717";
		private static final String TCP_BUFFER_SIZES_NR =
		"2097152,6291456,16777216,512000,2097152,8388608";
		private static final String TCP_BUFFER_SIZES_LTE_CA =
		"4096,6291456,12582912,4096,1048576,2097152";

		private void updateTcpBufferSizes(int rilRat) {
		String sizes = null;
		if (rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA) {
		// for now treat CA as LTE. Plan to surface the extra bandwith in a more
		// precise manner which should affect buffer sizes
		rilRat = ServiceState.RIL_RADIO_TECHNOLOGY_LTE;
		ServiceState ss = mPhone.getServiceState();
		if (rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE && ss.isUsingCarrierAggregation()) {
		rilRat = ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;
		}
		String ratName = ServiceState.rilRadioTechnologyToString(rilRat).toLowerCase(Locale.ROOT);
		// ServiceState gives slightly different names for EVDO tech ("evdo-rev.0" for ex)
		@@ -1045,7 +1046,8 @@ public class DataConnection extends StateMachine {
		// NR 5G Non-Standalone use LTE cell as the primary cell, the ril technology is LTE in this
		// case. We use NR 5G TCP buffer size when connected to NR 5G Non-Standalone network.
		if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN
		&& rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE && isNRConnected()
		&& ((rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE
		\|\| rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA) && isNRConnected())
		&& mPhone.getServiceStateTracker().getNrContextIds().contains(mCid)) {
		ratName = RAT_NAME_5G;
		}
		@@ -1096,7 +1098,6 @@ public class DataConnection extends StateMachine {
		sizes = TCP_BUFFER_SIZES_HSPA;
		break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE:
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:
		// Use NR 5G TCP buffer size when connected to NR 5G Non-Standalone network.
		if (RAT_NAME_5G.equals(ratName)) {
		sizes = TCP_BUFFER_SIZES_NR;
		@@ -1104,6 +1105,14 @@ public class DataConnection extends StateMachine {
		sizes = TCP_BUFFER_SIZES_LTE;
		}
		break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:
		// Use NR 5G TCP buffer size when connected to NR 5G Non-Standalone network.
		if (RAT_NAME_5G.equals(ratName)) {
		sizes = TCP_BUFFER_SIZES_NR;
		} else {
		sizes = TCP_BUFFER_SIZES_LTE_CA;
		}
		break;
		case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
		sizes = TCP_BUFFER_SIZES_HSPAP;
		break;