commit 90a53b406048f3f72b373638b921fadcdc28c0b2
author Chiachang Wang <chiachangwang@google.com> Wed Jan 26 03:41:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 26 03:41:07 2022 +0000
tree 632d46d244bc7188cdcb4a2221fdabe8c90f422a
parent 36eff124994c39ab98817a4de482f1bdbd9a3272
parent 40496330ccb0274a1450677208ae69535adf9be5

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

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

Change-Id: I3a2fd7d1e7ed0de398dc7bf0a09fe0374988762c

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,