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

resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp

Browse Source 
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
This commit is contained in:
Robert Greenwalt
2011-07-27 09:27:00 -07:00
parent 9186900f54 9520d6af5a
commit 377cf20b83
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1785,13 +1785,18 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (p == null) return; if (p == null) return;
Collection<InetAddress> dnses = p.getDnses(); Collection<InetAddress> dnses = p.getDnses();
try { try {
mNetd.setDnsServersForInterface(Integer.toString(netType), mNetd.setDnsServersForInterface(p.getInterfaceName(),
NetworkUtils.makeStrings(dnses)); NetworkUtils.makeStrings(dnses));
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "exception setting dns servers: " + e); Slog.e(TAG, "exception setting dns servers: " + e);
} }
boolean changed = false; boolean changed = false;
if (mNetConfigs[netType].isDefault()) { if (mNetConfigs[netType].isDefault()) {
try {
mNetd.setDefaultInterfaceForDns(p.getInterfaceName());
} catch (Exception e) {
Slog.e(TAG, "exception setting default dns interface: " + e);
}
int j = 1; int j = 1;
if (dnses.size() == 0 && mDefaultDns != null) { if (dnses.size() == 0 && mDefaultDns != null) {
String dnsString = mDefaultDns.getHostAddress(); String dnsString = mDefaultDns.getHostAddress();
@@ -1818,10 +1823,6 @@ 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);