commit 9164c10b67103d7cacee50966e17d64aa54a895b
author Chiachang Wang <chiachangwang@google.com> Thu Jan 13 10:54:32 2022 +0800
committer Chiachang Wang <chiachangwang@google.com> Tue Jan 18 17:45:30 2022 +0800
tree 3f42c7d1e0e6dba4925bbb3a4a6632ea7acfd9a7
parent 7aac4ad2f793734bffb8e5acb5dfd2e959160d9a

Send exclude local routes value to netd for VPN network

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I40ce741b6e918db7bf62cb5f29d9be1b16a94902

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 d625d1b..e0d28f3 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -4042,7 +4042,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,