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 am: 49f762eeee

Browse Source 
Original change: undetermined

Change-Id: Ibb927a4cb3eda4b8ac810aef812d42c9e6519f7a
This commit is contained in:
Robert Greenwalt
2021-05-31 11:47:46 +00:00
committed by Automerger Merge Worker
parent 1c4feb67e1 49f762eeee
commit 921f81f397
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();
if (p == null) return;
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;
if (mNetConfigs[netType].isDefault()) {
String network = nt.getNetworkInfo().getTypeName();
@@ -2001,7 +1995,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
} else {
try {
mNetd.setDnsServersForInterface(Integer.toString(netType),
mNetd.setDnsServersForInterface(p.getInterfaceName(),
NetworkUtils.makeStrings(dnses));
} catch (Exception e) {
Slog.e(TAG, "exception setting dns servers: " + e);