Merge "Fix default DNS not being set on network changes" (46a7b0d1) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -2619,7 +2619,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		// Caller must grab mDnsLock.
		private void updateDnsLocked(String network, String iface,
		Collection<InetAddress> dnses, String domains) {
		Collection<InetAddress> dnses, String domains, boolean defaultDns) {
		int last = 0;
		if (dnses.size() == 0 && mDefaultDns != null) {
		dnses = new ArrayList();
		@@ -2631,6 +2631,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		try {
		mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses), domains);
		if (defaultDns) {
		mNetd.setDefaultInterfaceForDns(iface);
		}

		for (InetAddress dns : dnses) {
		++last;
		String key = "net.dns" + last;
		@@ -2658,7 +2662,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		String network = nt.getNetworkInfo().getTypeName();
		synchronized (mDnsLock) {
		if (!mDnsOverridden) {
		updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains());
		updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains(), true);
		}
		}
		} else {
		@@ -3543,8 +3547,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		// Apply DNS changes.
		synchronized (mDnsLock) {
		updateDnsLocked("VPN", iface, addresses, domains);
		mDnsOverridden = true;
		updateDnsLocked("VPN", iface, addresses, domains, false);
		}

		// Temporarily disable the default proxy (not global).