Merge "Reintroduce the net.dns system properties <TEMP>" (72baa8fb) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -200,6 +200,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	private int mDefaultConnectionSequence = 0;		private int mDefaultConnectionSequence = 0;

	private Object mDnsLock = new Object();		private Object mDnsLock = new Object();
			private int mNumDnsEntries;
	private boolean mDnsOverridden = false;		private boolean mDnsOverridden = false;

	private boolean mTestMode;		private boolean mTestMode;
	@@ -2479,6 +2480,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
	try {		try {
	mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses), domains);		mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses), domains);
	mNetd.setDefaultInterfaceForDns(iface);		mNetd.setDefaultInterfaceForDns(iface);
			for (InetAddress dns : dnses) {
			++last;
			String key = "net.dns" + last;
			String value = dns.getHostAddress();
			SystemProperties.set(key, value);
			}
			for (int i = last + 1; i <= mNumDnsEntries; ++i) {
			String key = "net.dns" + i;
			SystemProperties.set(key, "");
			}
			mNumDnsEntries = last;
	} catch (Exception e) {		} catch (Exception e) {
	if (DBG) loge("exception setting default dns interface: " + e);		if (DBG) loge("exception setting default dns interface: " + e);
	}		}