LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515 am: 7aa3fe1ebd

Browse Source 
am: 3cf08592d6

Change-Id: Iec295ec4149e7a545d7e345b00e50dbedc76a7c9
This commit is contained in:
Lucas Lin
2018-11-29 01:25:06 -08:00
committed by android-build-merger
parent b4c1226881 3cf08592d6
commit 2861b15093
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2099,14 +2099,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
return new MockableSystemProperties(); return new MockableSystemProperties();
} }
// TODO: Replace nai and newLp with TcpBufferSizes and check default network before calling private void updateTcpBufferSizes(String tcpBufferSizes) {
// this method.
private void updateTcpBufferSizes(NetworkAgentInfo nai, LinkProperties newLp) {
if (isDefaultNetwork(nai) == false) {
return;
}
String tcpBufferSizes = newLp.getTcpBufferSizes();
String[] values = null; String[] values = null;
if (tcpBufferSizes != null) { if (tcpBufferSizes != null) {
values = tcpBufferSizes.split(","); values = tcpBufferSizes.split(",");
@@ -4798,7 +4791,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
// for (LinkProperties lp : newLp.getStackedLinks()) { // for (LinkProperties lp : newLp.getStackedLinks()) {
// updateMtu(lp, null); // updateMtu(lp, null);
// } // }
updateTcpBufferSizes(networkAgent, newLp); if (isDefaultNetwork(networkAgent)) {
updateTcpBufferSizes(newLp.getTcpBufferSizes());
}
updateRoutes(newLp, oldLp, netId); updateRoutes(newLp, oldLp, netId);
updateDnses(newLp, oldLp, netId); updateDnses(newLp, oldLp, netId);
@@ -5289,7 +5284,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
notifyLockdownVpn(newNetwork); notifyLockdownVpn(newNetwork);
handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
updateTcpBufferSizes(newNetwork, new LinkProperties(newNetwork.linkProperties)); updateTcpBufferSizes(newNetwork.linkProperties.getTcpBufferSizes());
mDnsManager.setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers()); mDnsManager.setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers());
notifyIfacesChangedForNetworkStats(); notifyIfacesChangedForNetworkStats();
} }