Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev (32f3518d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3593,8 +3593,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
	// updateMtu(lp, null);		// updateMtu(lp, null);
	// }		// }
	updateTcpBufferSizes(networkAgent);		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(
			NetworkCapabilities.NET_CAPABILITY_INTERNET);
	final boolean flushDns = updateRoutes(newLp, oldLp, netId);		final boolean flushDns = updateRoutes(newLp, oldLp, netId);
	updateDnses(newLp, oldLp, netId, flushDns);		updateDnses(newLp, oldLp, netId, flushDns, useDefaultDns);

	updateClat(newLp, oldLp, networkAgent);		updateClat(newLp, oldLp, networkAgent);
	if (isDefaultNetwork(networkAgent)) handleApplyDefaultProxy(newLp.getHttpProxy());		if (isDefaultNetwork(networkAgent)) handleApplyDefaultProxy(newLp.getHttpProxy());
	// TODO - move this check to cover the whole function		// TODO - move this check to cover the whole function
	@@ -3688,10 +3694,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
	}		}
	return !routeDiff.added.isEmpty() \|\| !routeDiff.removed.isEmpty();		return !routeDiff.added.isEmpty() \|\| !routeDiff.removed.isEmpty();
	}		}
	private void updateDnses(LinkProperties newLp, LinkProperties oldLp, int netId, boolean flush) {		private void updateDnses(LinkProperties newLp, LinkProperties oldLp, int netId,
			boolean flush, boolean useDefaultDns) {
	if (oldLp == null \|\| (newLp.isIdenticalDnses(oldLp) == false)) {		if (oldLp == null \|\| (newLp.isIdenticalDnses(oldLp) == false)) {
	Collection<InetAddress> dnses = newLp.getDnsServers();		Collection<InetAddress> dnses = newLp.getDnsServers();
	if (dnses.size() == 0 && mDefaultDns != null) {		if (dnses.size() == 0 && mDefaultDns != null && useDefaultDns) {
	dnses = new ArrayList();		dnses = new ArrayList();
	dnses.add(mDefaultDns);		dnses.add(mDefaultDns);
	if (DBG) {		if (DBG) {

services/core/java/com/android/server/NetworkManagementService.java

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1710,15 +1710,19 @@ public class NetworkManagementService extends INetworkManagementService.Stub
	public void setDnsServersForNetwork(int netId, String[] servers, String domains) {		public void setDnsServersForNetwork(int netId, String[] servers, String domains) {
	mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);		mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

	final Command cmd = new Command("resolver", "setnetdns", netId,		Command cmd;
			if (servers.length > 0) {
			cmd = new Command("resolver", "setnetdns", netId,
	(domains == null ? "" : domains));		(domains == null ? "" : domains));

	for (String s : servers) {		for (String s : servers) {
	InetAddress a = NetworkUtils.numericToInetAddress(s);		InetAddress a = NetworkUtils.numericToInetAddress(s);
	if (a.isAnyLocalAddress() == false) {		if (a.isAnyLocalAddress() == false) {
	cmd.appendArg(a.getHostAddress());		cmd.appendArg(a.getHostAddress());
	}		}
	}		}
			} else {
			cmd = new Command("resolver", "clearnetdns", netId);
			}

	try {		try {
	mConnector.execute(cmd);		mConnector.execute(cmd);