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

resolved conflicts for merge of 377cf20b to master

Browse Source 
Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129
This commit is contained in:
Robert Greenwalt
2011-07-27 10:00:36 -07:00
parent 4d5ecf6bb2 377cf20b83
commit 49f762eeee
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1985,12 +1985,6 @@ 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(p.getInterfaceName(),
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()) {
String network = nt.getNetworkInfo().getTypeName(); String network = nt.getNetworkInfo().getTypeName();
@@ -2001,7 +1995,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} else { } else {
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);