Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfaa01b8 authored by frank PREEL's avatar frank PREEL Committed by Alexandre Roux
Browse files

Override Lp

Change-Id: I15d76677421ebddf15522a5fd980e8e0c19348fb
parent 251a4e6b
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -5737,12 +5737,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
                //InetAddress addr = InetAddress.getByName(s);
                //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) {
                    final Collection<InetAddress> dnses = newLp.getDnsServers();
                    log("Setting DNS servers for network " + netId + " to " + dnses);
                }
                try {
                    mDnsManager.setDnsConfigurationForNetwork(netId, defaultNai.linkProperties, isDefaultNetwork);
                    mDnsManager.setDnsConfigurationForNetwork(netId, newLp, isDefaultNetwork);
                } catch (Exception e) {
                    loge("Exception in setDnsConfigurationForNetwork: " + e);
                }
+27 −0
Original line number Diff line number Diff line
@@ -307,6 +307,33 @@ public class DnsManager {
    public void setDnsConfigurationForNetwork(
            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);
            }
        }


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



        updateParametersSettings();
        final ResolverParamsParcel paramsParcel = new ResolverParamsParcel();