}
            boolean changed = false;
            if (mNetConfigs[netType].isDefault()) {
<<<<<<< HEAD
                String network = nt.getNetworkInfo().getTypeName();
                synchronized (mDnsLock) {
                    if (!mDnsOverridden) {
                        changed = updateDns(network, dnses, "");
=======
                int j = 1;
                if (dnses.size() == 0 && mDefaultDns != null) {
                    String dnsString = mDefaultDns.getHostAddress();
                    if (!dnsString.equals(SystemProperties.get("net.dns1"))) {
                        if (DBG) {
                            log("no dns provided - using " + dnsString);
                        }
                        changed = true;
                        SystemProperties.set("net.dns1", dnsString);
                    }
                    j++;
                } else {
                    for (InetAddress dns : dnses) {
                        String dnsString = dns.getHostAddress();
                        if (!changed && dnsString.equals(SystemProperties.get("net.dns" + j))) {
                            j++;
                            continue;
                        }
                        if (DBG) {
                            log("adding dns " + dns + " for " +
                                    nt.getNetworkInfo().getTypeName());
                        }
                        changed = true;
                        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>>>>>> a7f68230be1ac025dbeada77e2ff3f16bb2ac04c
                    }
                }
            } else {

            boolean changed = false;
            if (mNetConfigs[netType].isDefault()) {
                String network = nt.getNetworkInfo().getTypeName();
                synchronized (mDnsLock) {
                    if (!mDnsOverridden) {
                        changed = updateDns(network, p.getInterfaceName(), dnses, "");
                    }
                }
            } else {
                try {
                    mNetd.setDnsServersForInterface(Integer.toString(netType),
                            NetworkUtils.makeStrings(dnses));
                } catch (Exception e) {
                    Slog.e(TAG, "exception setting dns servers: " + e);
                }