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

Merge "Remove 'hasDns' parameter" am: fa9ee4fad7

Browse Source 
am: b2afafdb9c

Change-Id: I43080dc7922ab6b8b1c61f7a2542dd8cead45bc5
This commit is contained in:
Ken Chen
2018-12-18 10:50:11 -08:00
committed by android-build-merger
parent db3357dc76 b2afafdb9c
commit cfd06c2074
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -5714,7 +5714,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
// This should never fail. Specifying an already in use NetID will cause failure. // This should never fail. Specifying an already in use NetID will cause failure.
if (networkAgent.isVPN()) { if (networkAgent.isVPN()) {
mNMS.createVirtualNetwork(networkAgent.network.netId, mNMS.createVirtualNetwork(networkAgent.network.netId,
!networkAgent.linkProperties.getDnsServers().isEmpty(),
(networkAgent.networkMisc == null || (networkAgent.networkMisc == null ||
!networkAgent.networkMisc.allowBypass)); !networkAgent.networkMisc.allowBypass));
} else { } else {