resolved conflicts for merge of af75fdb1 to master (c59c6da9) · Commits · e / os / android_frameworks_base

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -1985,12 +1985,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		LinkProperties p = nt.getLinkProperties();
		if (p == null) return;
		Collection<InetAddress> dnses = p.getDnses();
		try {
		mNetd.setDnsServersForInterface(p.getInterfaceName(),
		NetworkUtils.makeStrings(dnses));
		} catch (Exception e) {
		Slog.e(TAG, "exception setting dns servers: " + e);
		}
		boolean changed = false;
		if (mNetConfigs[netType].isDefault()) {
		String network = nt.getNetworkInfo().getTypeName();
		@@ -2001,7 +1995,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		} else {
		try {
		mNetd.setDnsServersForInterface(Integer.toString(netType),
		mNetd.setDnsServersForInterface(p.getInterfaceName(),
		NetworkUtils.makeStrings(dnses));
		} catch (Exception e) {
		Slog.e(TAG, "exception setting dns servers: " + e);