Merge "Stop setting net.dns{1234} system properties." (c715ea84) · Commits · e / os / android_frameworks_base

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -4579,28 +4579,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		} catch (Exception e) {
		loge("Exception in setDnsConfigurationForNetwork: " + e);
		}
		final NetworkAgentInfo defaultNai = getDefaultNetwork();
		if (defaultNai != null && defaultNai.network.netId == netId) {
		setDefaultDnsSystemProperties(dnses);
		}
		flushVmDnsCache();
		}

		private void setDefaultDnsSystemProperties(Collection<InetAddress> dnses) {
		int last = 0;
		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;
		}

		private String getNetworkPermission(NetworkCapabilities nc) {
		// TODO: make these permission strings AIDL constants instead.
		if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) {
		@@ -4817,7 +4798,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		notifyLockdownVpn(newNetwork);
		handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
		updateTcpBufferSizes(newNetwork);
		setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers());
		}

		private void processListenRequests(NetworkAgentInfo nai, boolean capabilitiesChanged) {