joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Send exclude local routes value to netd for VPN network" am: 317be96553 am: 35a7b80089

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948168

Change-Id: I4eaa5e55e5342d3bdf9ff3fbb8ca57868f92674d
This commit is contained in:
Chiachang Wang 2022-01-26 02:40:58 +00:00 • committed by Automerger Merge Worker
commit 40496330cc
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/src/com/android/server/ConnectivityService.java
View file

@ -4046,7 +4046,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL,
INetd.PERMISSION_NONE,
(nai.networkAgentConfig == null || !nai.networkAgentConfig.allowBypass),
getVpnType(nai), /*excludeLocalRoutes=*/ false);
getVpnType(nai), nai.networkAgentConfig.excludeLocalRouteVpn);
} else {
config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.PHYSICAL,
getNetworkPermission(nai.networkCapabilities), /*secure=*/ false,