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

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

Change-Id: Icb5b54a205fe07b704238d2f65f78a24f4e1e36d
This commit is contained in:
Chiachang Wang 2022-01-26 02:22:45 +00:00 • committed by Automerger Merge Worker
commit 35a7b80089

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,