commit 46fd6d691a9726cd5ecea61c508d8b9cf2ff7c2b
author Chiachang Wang <chiachangwang@google.com> Wed Jan 26 02:39:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 26 02:39:53 2022 +0000
tree 94a4dd1d64b1d19f273c83ba090f6bc465008c43
parent c8d089fd8a1f960e1b44379cd7c5a14e8823027b
parent 3e5a9aea24b3e45ddf9766e56d96af088034e3fd

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

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

Change-Id: Ib9e254160be4a6d761e8f2d446def164c37eb116

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index ae6fe11..145eade 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -4046,7 +4046,7 @@
                 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,