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 am: 4d5ecf6bb2

Browse Source 
Original change: undetermined

Change-Id: Id5642f97d918aa821a2c7834f15e03703b50401b
This commit is contained in:
Robert Greenwalt
2021-05-31 11:47:33 +00:00
committed by Automerger Merge Worker
parent 600e42beea 4d5ecf6bb2
commit 1c4feb67e1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1985,6 +1985,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(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();