From 821c97863f0a0c4f736fe0234903d2027a6d566f Mon Sep 17 00:00:00 2001 From: lucaslin Date: Wed, 28 Nov 2018 19:27:52 +0800 Subject: [PATCH] Simpify logic in updateTcpBufferSizes updateTcpBufferSizes() only need tcp buffer size as its parameter. Also unify the logic to check default network outside the function. Bug: 120119769 Test: 1. Build pass. 2. runtest frameworks-net Change-Id: Iee9fec3efe7d5be5b590dd1c1f67ec5de636e613 --- .../com/android/server/ConnectivityService.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 60bbca8339..bb3b9f72d5 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2099,14 +2099,7 @@ public class ConnectivityService extends IConnectivityManager.Stub return new MockableSystemProperties(); } - // TODO: Replace nai and newLp with TcpBufferSizes and check default network before calling - // this method. - private void updateTcpBufferSizes(NetworkAgentInfo nai, LinkProperties newLp) { - if (isDefaultNetwork(nai) == false) { - return; - } - - String tcpBufferSizes = newLp.getTcpBufferSizes(); + private void updateTcpBufferSizes(String tcpBufferSizes) { String[] values = null; if (tcpBufferSizes != null) { values = tcpBufferSizes.split(","); @@ -4798,7 +4791,9 @@ public class ConnectivityService extends IConnectivityManager.Stub // for (LinkProperties lp : newLp.getStackedLinks()) { // updateMtu(lp, null); // } - updateTcpBufferSizes(networkAgent, newLp); + if (isDefaultNetwork(networkAgent)) { + updateTcpBufferSizes(newLp.getTcpBufferSizes()); + } updateRoutes(newLp, oldLp, netId); updateDnses(newLp, oldLp, netId); @@ -5289,7 +5284,7 @@ public class ConnectivityService extends IConnectivityManager.Stub notifyLockdownVpn(newNetwork); handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); - updateTcpBufferSizes(newNetwork, new LinkProperties(newNetwork.linkProperties)); + updateTcpBufferSizes(newNetwork.linkProperties.getTcpBufferSizes()); mDnsManager.setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers()); notifyIfacesChangedForNetworkStats(); }