Disable mDefaultDns to see if we can remove it.

Bug: 21146610
Change-Id: I385f1c8780acc97d955002f469a6c8ad65db1578
This commit is contained in:
Lorenzo Colitti
2015-05-14 22:12:36 +09:00
parent 1aa80c66de
commit 8ccb6b171b

View File

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