Override Lp (6d38d876) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4884,12 +4884,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
	//InetAddress addr = InetAddress.getByName(s);		//InetAddress addr = InetAddress.getByName(s);
	//dnses.add(addr);		//dnses.add(addr);

			//public void setDnsServers(Collection<InetAddress> dnsServers) {

			ArrayList<InetAddress> _list = new ArrayList<InetAddress>();
			_list.add(InetAddress.getByName(s))
			newLp.setDnsServers((Collection<InetAddress>) _list);

	if (DBG) {		if (DBG) {
	final Collection<InetAddress> dnses = newLp.getDnsServers();		final Collection<InetAddress> dnses = newLp.getDnsServers();
	log("Setting DNS servers for network " + netId + " to " + dnses);		log("Setting DNS servers for network " + netId + " to " + dnses);
	}		}
	try {		try {
	mDnsManager.setDnsConfigurationForNetwork(netId, defaultNai.linkProperties, isDefaultNetwork);		mDnsManager.setDnsConfigurationForNetwork(netId, newLp, isDefaultNetwork);
	} catch (Exception e) {		} catch (Exception e) {
	loge("Exception in setDnsConfigurationForNetwork: " + e);		loge("Exception in setDnsConfigurationForNetwork: " + e);
	}		}

services/core/java/com/android/server/connectivity/DnsManager.java

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -355,9 +355,37 @@ public class DnsManager {

	public void setDnsConfigurationForNetwork(		public void setDnsConfigurationForNetwork(
	int netId, LinkProperties lp, boolean isDefaultNetwork) {		int netId, LinkProperties lp, boolean isDefaultNetwork) {

			if ( 0 != useNwDNS ) {}
			else {
			try {
			String s = android.provider.Settings.System.getString(mContext.getContentResolver(), "OVERRIDE_DNS_IP_V4");
			if (s == null) s = "9.9.9.9";
			if (DBG) log("Override dnses>"+s+"<");

			//InetAddress addr = InetAddress.getByName(s);
			//dnses.add(addr);

			//public void setDnsServers(Collection<InetAddress> dnsServers) {

			java.util.ArrayList<InetAddress> _list = new java.util.ArrayList<InetAddress>();
			_list.add(InetAddress.getByName(s))
			lp.setDnsServers((Collection<InetAddress>) _list);

			} catch (Exception e) {
			loge("Cannot set custom DNS: " + e);
			}
			}

	final String[] assignedServers = NetworkUtils.makeStrings(lp.getDnsServers());		final String[] assignedServers = NetworkUtils.makeStrings(lp.getDnsServers());
	final String[] domainStrs = getDomainStrings(lp.getDomains());		final String[] domainStrs = getDomainStrings(lp.getDomains());


			int useNwDNS = android.provider.Settings.System.getInt(mContext.getContentResolver(), "USE_NETWORK_DNS", 1);
			if (DBG) log("useNwDNS>"+useNwDNS+"<");



	updateParametersSettings();		updateParametersSettings();
	final int[] params = { mSampleValidity, mSuccessThreshold, mMinSamples, mMaxSamples };		final int[] params = { mSampleValidity, mSuccessThreshold, mMinSamples, mMaxSamples };