Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy isBypassable flag from VpnProfile to VpnConfig

Browse Source 
Copy isBypassable flag from VpnProfile to VpnConfig so that
ConnectivityService can set the correct config to netd when
network is created.

VpnConfig#allowBypass isn't set for platform VPN when
startVpnProfilePrivileged tries to convert the VpnProfile
to VpnConfig.

Bug: 242931436
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2
(cherry picked from commit c43db8b4e6)
Merged-In: Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2
This commit is contained in:
lucaslin
2022-08-18 11:18:43 +08:00
parent cd981b3681
commit f96e5ad580
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -4040,6 +4040,7 @@ public class Vpn {
mConfig.proxyInfo = profile.proxy; mConfig.proxyInfo = profile.proxy;
mConfig.requiresInternetValidation = profile.requiresInternetValidation; mConfig.requiresInternetValidation = profile.requiresInternetValidation;
mConfig.excludeLocalRoutes = profile.excludeLocalRoutes; mConfig.excludeLocalRoutes = profile.excludeLocalRoutes;
mConfig.allowBypass = profile.isBypassable;
switch (profile.type) { switch (profile.type) {
case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: