Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55bbf9eb authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Merge "Apply TcpBufferSize of CarrierConfig from ConnectingState" am: e9a8989e am: 1ad71669 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2327353



Change-Id: I5e524aa0a496cb50a8dd85d4507471e66d3160c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65b56e25 1ad71669

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -904,8 +904,8 @@ public class DataNetwork extends StateMachine { 
        mAttachedNetworkRequestList.addAll(networkRequestList);

        mAttachedNetworkRequestList.addAll(networkRequestList);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, INVALID_CID);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WWAN, INVALID_CID);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WLAN, INVALID_CID);

        mCid.put(AccessNetworkConstants.TRANSPORT_TYPE_WLAN, INVALID_CID);

        mTcpBufferSizes = mDataConfigManager.getDefaultTcpConfigString();

        mTelephonyDisplayInfo = mPhone.getDisplayInfoController().getTelephonyDisplayInfo();

        mTelephonyDisplayInfo = mPhone.getDisplayInfoController().getTelephonyDisplayInfo();

        mTcpBufferSizes = mDataConfigManager.getTcpConfigString(mTelephonyDisplayInfo);





        for (TelephonyNetworkRequest networkRequest : networkRequestList) {

        for (TelephonyNetworkRequest networkRequest : networkRequestList) {

            networkRequest.setAttachedNetwork(DataNetwork.this);

            networkRequest.setAttachedNetwork(DataNetwork.this);