commit cd7e084a0be62e21a94567f5c2559148ead40b66
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 01 09:56:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 01 09:56:29 2023 +0000
tree bcc15aa17bcd17dfe6707d87da7a33ca8b0f7947
parent 93da33387fccde6aa044b12ea8a8c1f60e99fb9c
parent 4889ec3c9a103c2539161b1faff0d941204d10d4

Merge "Fix adopt the last data profile that works for internet as preferred"

src/java/com/android/internal/telephony/data/DataNetwork.java

diff --git a/src/java/com/android/internal/telephony/data/DataNetwork.java b/src/java/com/android/internal/telephony/data/DataNetwork.java
index 3ea3abc..663be07 100644
--- a/src/java/com/android/internal/telephony/data/DataNetwork.java
+++ b/src/java/com/android/internal/telephony/data/DataNetwork.java
@@ -898,8 +898,8 @@
         mAttachedNetworkRequestList.addAll(networkRequestList);
         mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, INVALID_CID);
         mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WLAN, INVALID_CID);
-        mTcpBufferSizes = mDataConfigManager.getDefaultTcpConfigString();
         mTelephonyDisplayInfo = mPhone.getDisplayInfoController().getTelephonyDisplayInfo();
+        mTcpBufferSizes = mDataConfigManager.getTcpConfigString(mTelephonyDisplayInfo);
 
         for (TelephonyNetworkRequest networkRequest : networkRequestList) {
             networkRequest.setAttachedNetwork(DataNetwork.this);

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
index bf5a42d..f500756 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
@@ -56,6 +56,7 @@
 import android.telephony.NetworkRegistrationInfo;
 import android.telephony.PreciseDataConnectionState;
 import android.telephony.ServiceState;
+import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
 import android.telephony.data.ApnSetting;
 import android.telephony.data.DataCallResponse;
@@ -403,6 +404,7 @@
         // updated later.
         assertThat(linkPropertiesCaptor.getValue()).isEqualTo(new LinkProperties());
 
+        verify(mDataConfigManager).getTcpConfigString(any(TelephonyDisplayInfo.class));
         verify(mSimulatedCommandsVerifier, never()).allocatePduSessionId(any(Message.class));
         verify(mMockedWwanDataServiceManager).setupDataCall(eq(AccessNetworkType.EUTRAN),
                 eq(mInternetDataProfile), eq(false), eq(false),