LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
This commit is contained in:
Robert Greenwalt
2011-07-25 12:08:19 -07:00
parent 6ef5bd7a00 44cc474470
commit aaf31586ce
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/ConnectivityService.java
View File

@@ -1784,6 +1784,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
LinkProperties p = nt.getLinkProperties(); LinkProperties p = nt.getLinkProperties();
if (p == null) return; if (p == null) return;
Collection<InetAddress> dnses = p.getDnses(); 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; boolean changed = false;
if (mNetConfigs[netType].isDefault()) { if (mNetConfigs[netType].isDefault()) {
int j = 1; int j = 1;
@@ -1812,6 +1818,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
SystemProperties.set("net.dns" + j++, dnsString); 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++) { for (int k=j ; k<mNumDnsEntries; k++) {
if (changed || !TextUtils.isEmpty(SystemProperties.get("net.dns" + k))) { if (changed || !TextUtils.isEmpty(SystemProperties.get("net.dns" + k))) {
if (DBG) log("erasing net.dns" + k); if (DBG) log("erasing net.dns" + k);