Update TCP buffer size for 5G data connections
In 5G NSA, the TCP buffer size is not updated when the data connection
is established because the RAT type of the data connection is LTE.
Framework knows the 5G data conenctions when the there is a 5G physical
channel reported, so we need to update the tcp buffer size at that
moment.
Bug: 135941346
Test: atest ServiceStateTrackerTest
Merged-In: Id545e007b191e0b28aaa5c976484bb27259679fe
Change-Id: Id545e007b191e0b28aaa5c976484bb27259679fe
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index b95fc06..ed6d122 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -117,9 +117,11 @@
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
@@ -212,6 +214,7 @@
private RegistrantList mPsRestrictEnabledRegistrants = new RegistrantList();
private RegistrantList mPsRestrictDisabledRegistrants = new RegistrantList();
private RegistrantList mImsCapabilityChangedRegistrants = new RegistrantList();
+ private RegistrantList mNrStateChangedRegistrants = new RegistrantList();
/* Radio power off pending flag and tag counter */
private boolean mPendingRadioPowerOffAfterDataOff = false;
@@ -1549,8 +1552,10 @@
mLastPhysicalChannelConfigList = list;
boolean hasChanged =
updateNrFrequencyRangeFromPhysicalChannelConfigs(list, mSS);
- hasChanged |= updateNrStateFromPhysicalChannelConfigs(
- list, mSS);
+ if (updateNrStateFromPhysicalChannelConfigs(list, mSS)) {
+ mNrStateChangedRegistrants.notifyRegistrants();
+ hasChanged = true;
+ }
// Notify NR frequency, NR connection status or bandwidths changed.
if (hasChanged
@@ -5518,4 +5523,43 @@
}
return ServiceState.networkTypeToRilRadioTechnology(networkType);
}
+
+ /**
+ * Registers for 5G NR state changed.
+ * @param h handler to notify
+ * @param what what code of message when delivered
+ * @param obj placed in Message.obj
+ */
+ public void registerForNrStateChanged(Handler h, int what, Object obj) {
+ Registrant r = new Registrant(h, what, obj);
+ mNrStateChangedRegistrants.add(r);
+ }
+
+ /**
+ * Unregisters for 5G NR state changed.
+ * @param h handler to notify
+ */
+ public void unregisterForNrStateChanged(Handler h) {
+ mNrStateChangedRegistrants.remove(h);
+ }
+
+ /**
+ * Get the NR data connection context ids.
+ *
+ * @return data connection context ids.
+ */
+ @NonNull
+ public Set<Integer> getNrContextIds() {
+ Set<Integer> idSet = new HashSet<>();
+
+ for (PhysicalChannelConfig config : mLastPhysicalChannelConfigList) {
+ if (isNrPhysicalChannelConfig(config)) {
+ for (int id : config.getContextIds()) {
+ idSet.add(id);
+ }
+ }
+ }
+
+ return idSet;
+ }
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 0cd80b3..93a1ceb 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -264,7 +264,7 @@
private static final String NULL_IP = "0.0.0.0";
private Object mUserData;
private int mSubscriptionOverride;
- private int mRilRat = Integer.MAX_VALUE;
+ private int mRilRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
private int mDataRegState = Integer.MAX_VALUE;
private NetworkInfo mNetworkInfo;
@@ -280,6 +280,8 @@
private int mDisabledApnTypeBitMask = 0;
int mTag;
+
+ /** Data connection id assigned by the modem. This is unique across transports */
public int mCid;
@HandoverState
@@ -315,9 +317,10 @@
static final int EVENT_RESET = BASE + 24;
static final int EVENT_REEVALUATE_RESTRICTED_STATE = BASE + 25;
static final int EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES = BASE + 26;
+ static final int EVENT_NR_STATE_CHANGED = BASE + 27;
private static final int CMD_TO_STRING_COUNT =
- EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES - BASE + 1;
+ EVENT_NR_STATE_CHANGED - BASE + 1;
private static String[] sCmdToString = new String[CMD_TO_STRING_COUNT];
static {
@@ -353,6 +356,8 @@
"EVENT_REEVALUATE_RESTRICTED_STATE";
sCmdToString[EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES - BASE] =
"EVENT_REEVALUATE_DATA_CONNECTION_PROPERTIES";
+ sCmdToString[EVENT_NR_STATE_CHANGED - BASE] =
+ "EVENT_NR_STATE_CHANGED";
}
// Convert cmd to string or null if unknown
static String cmdToString(int cmd) {
@@ -583,9 +588,16 @@
mId = id;
mCid = -1;
ServiceState ss = mPhone.getServiceState();
- mRilRat = ss.getRilDataRadioTechnology();
mDataRegState = mPhone.getServiceState().getDataRegState();
- int networkType = ss.getDataNetworkType();
+ int networkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
+
+ NetworkRegistrationInfo nri = ss.getNetworkRegistrationInfo(
+ NetworkRegistrationInfo.DOMAIN_PS, mTransportType);
+ if (nri != null) {
+ networkType = nri.getAccessNetworkTechnology();
+ mRilRat = ServiceState.networkTypeToRilRadioTechnology(networkType);
+ }
+
mNetworkInfo = new NetworkInfo(ConnectivityManager.TYPE_MOBILE,
networkType, NETWORK_TYPE, TelephonyManager.getNetworkTypeName(networkType));
mNetworkInfo.setRoaming(ss.getDataRoaming());
@@ -991,10 +1003,14 @@
// 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 (rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE && isNRConnected()) {
+ if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN
+ && rilRat == ServiceState.RIL_RADIO_TECHNOLOGY_LTE && isNRConnected()
+ && mPhone.getServiceStateTracker().getNrContextIds().contains(mCid)) {
ratName = RAT_NAME_5G;
}
+ log("updateTcpBufferSizes: " + ratName);
+
// in the form: "ratname:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max"
String[] configOverride = mPhone.getContext().getResources().getStringArray(
com.android.internal.R.array.config_mobile_tcp_buffers);
@@ -1041,7 +1057,7 @@
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 (isNRConnected()) {
+ if (RAT_NAME_5G.equals(ratName)) {
sizes = TCP_BUFFER_SIZES_NR;
} else {
sizes = TCP_BUFFER_SIZES_LTE;
@@ -1050,6 +1066,9 @@
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
sizes = TCP_BUFFER_SIZES_HSPAP;
break;
+ case ServiceState.RIL_RADIO_TECHNOLOGY_NR:
+ sizes = TCP_BUFFER_SIZES_NR;
+ break;
default:
// Leave empty - this will let ConnectivityService use the system default.
break;
@@ -1486,6 +1505,8 @@
DataConnection.EVENT_DATA_CONNECTION_ROAM_ON, null);
mPhone.getServiceStateTracker().registerForDataRoamingOff(getHandler(),
DataConnection.EVENT_DATA_CONNECTION_ROAM_OFF, null, true);
+ mPhone.getServiceStateTracker().registerForNrStateChanged(getHandler(),
+ DataConnection.EVENT_NR_STATE_CHANGED, null);
// Add ourselves to the list of data connections
mDcController.addDc(DataConnection.this);
@@ -1602,8 +1623,7 @@
break;
default:
if (DBG) {
- log("DcDefaultState: shouldn't happen but ignore msg.what="
- + getWhatToString(msg.what));
+ log("DcDefaultState: ignore msg.what=" + getWhatToString(msg.what));
}
break;
}
@@ -2353,6 +2373,14 @@
retVal = HANDLED;
break;
}
+ case EVENT_NR_STATE_CHANGED: {
+ updateTcpBufferSizes(mRilRat);
+ if (mNetworkAgent != null) {
+ mNetworkAgent.sendLinkProperties(mLinkProperties, DataConnection.this);
+ }
+ retVal = HANDLED;
+ break;
+ }
default:
if (VDBG) {
log("DcActiveState not handled msg.what=" + getWhatToString(msg.what));
