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

Commit a7f68230 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp 

Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
parents 051660d4 26ecc31f

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

+10 −0
Original line number Diff line number Diff line
@@ -1784,6 +1784,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            LinkProperties p = nt.getLinkProperties();

            if (p == null) return;

            Collection<InetAddress> dnses = p.getDnses();

            try {

                mNetd.setDnsServersForInterface(Integer.toString(netType),

                        NetworkUtils.makeStrings(dnses));

            } catch (Exception e) {

                Slog.e(TAG, "exception setting dns servers: " + e);

            }

            boolean changed = false;

            if (mNetConfigs[netType].isDefault()) {

                int j = 1;
@@ -1812,6 +1818,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                        SystemProperties.set("net.dns" + j++, dnsString);

                    }

                }

                try {

                    mNetd.setDefaultInterfaceForDns(Integer.toString(netType));

                } catch (Exception e) {

                    Slog.e(TAG, "exception setting default dns interface: " + e);}

                for (int k=j ; k<mNumDnsEntries; k++) {

                    if (changed || !TextUtils.isEmpty(SystemProperties.get("net.dns" + k))) {

                        if (DBG) log("erasing net.dns" + k);