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

Don\'t flush DNS cache on route changes. am: b988890

Browse Source 
am: 09a5fbd

* commit '09a5fbd6ec86000f95423a47e9266ee124609cb3':
  Don't flush DNS cache on route changes.

Change-Id: I0e019a46548bbc81628939989fad39f96bc83ebe
This commit is contained in:
Erik Kline
2016-04-06 04:00:25 +00:00
committed by android-build-merger
parent 62ba687155 b988890b21
commit 1fb9333459
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4137,8 +4137,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
// }
updateTcpBufferSizes(networkAgent);
final boolean flushDns = updateRoutes(newLp, oldLp, netId);
updateDnses(newLp, oldLp, netId, flushDns);
updateRoutes(newLp, oldLp, netId);
updateDnses(newLp, oldLp, netId);
updateClat(newLp, oldLp, networkAgent);
if (isDefaultNetwork(networkAgent)) {
@@ -4241,30 +4241,24 @@ public class ConnectivityService extends IConnectivityManager.Stub
return !routeDiff.added.isEmpty() || !routeDiff.removed.isEmpty();
}
private void updateDnses(LinkProperties newLp, LinkProperties oldLp, int netId,
boolean flush) {
if (oldLp == null || (newLp.isIdenticalDnses(oldLp) == false)) {
Collection<InetAddress> dnses = newLp.getDnsServers();
if (DBG) log("Setting Dns servers for network " + netId + " to " + dnses);
try {
mNetd.setDnsServersForNetwork(netId, NetworkUtils.makeStrings(dnses),
newLp.getDomains());
} catch (Exception e) {
loge("Exception in setDnsServersForNetwork: " + e);
}
final NetworkAgentInfo defaultNai = getDefaultNetwork();
if (defaultNai != null && defaultNai.network.netId == netId) {
setDefaultDnsSystemProperties(dnses);
}
flushVmDnsCache();
} else if (flush) {
try {
mNetd.flushNetworkDnsCache(netId);
} catch (Exception e) {
loge("Exception in flushNetworkDnsCache: " + e);
}
flushVmDnsCache();
private void updateDnses(LinkProperties newLp, LinkProperties oldLp, int netId) {
if (oldLp != null && newLp.isIdenticalDnses(oldLp)) {
return; // no updating necessary
}
Collection<InetAddress> dnses = newLp.getDnsServers();
if (DBG) log("Setting Dns servers for network " + netId + " to " + dnses);
try {
mNetd.setDnsServersForNetwork(
netId, NetworkUtils.makeStrings(dnses), newLp.getDomains());
} catch (Exception e) {
loge("Exception in setDnsServersForNetwork: " + e);
}
final NetworkAgentInfo defaultNai = getDefaultNetwork();
if (defaultNai != null && defaultNai.network.netId == netId) {
setDefaultDnsSystemProperties(dnses);
}
flushVmDnsCache();
}
private void setDefaultDnsSystemProperties(Collection<InetAddress> dnses) {