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

am 9d68fe46: am 74c720c9: am a267d9c1: Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev

Browse Source 
* commit '9d68fe46504ac2521fbcc8ad5e5d7e74dbffd89c':
  Disable mDefaultDns to see if we can remove it.
This commit is contained in:
Lorenzo Colitti
2015-06-04 06:06:26 +00:00
committed by Android Git Automerger
parent e979fc9e4c a267d9c1f9
commit 2e5c4ee2ca
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3819,10 +3819,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
// } // }
updateTcpBufferSizes(networkAgent); updateTcpBufferSizes(networkAgent);
// TODO: deprecate and remove mDefaultDns when we can do so safely. // TODO: deprecate and remove mDefaultDns when we can do so safely. See http://b/18327075
// For now, use it only when the network has Internet access. http://b/18327075 // In L, we used it only when the network had Internet access but provided no DNS servers.
final boolean useDefaultDns = networkAgent.networkCapabilities.hasCapability( // For now, just disable it, and if disabling it doesn't break things, remove it.
NET_CAPABILITY_INTERNET); // final boolean useDefaultDns = networkAgent.networkCapabilities.hasCapability(
// NET_CAPABILITY_INTERNET);
final boolean useDefaultDns = false;
final boolean flushDns = updateRoutes(newLp, oldLp, netId); final boolean flushDns = updateRoutes(newLp, oldLp, netId);
updateDnses(newLp, oldLp, netId, flushDns, useDefaultDns); updateDnses(newLp, oldLp, netId, flushDns, useDefaultDns);