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

Merge "Set legacy type for VPN" into sc-dev am: e1b6e11c72

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963618

Change-Id: I0fdd2ae01064d671e2dd962f95e53654ceb16536
This commit is contained in:
Lucas Lin
2021-06-18 03:02:05 +00:00
committed by Automerger Merge Worker
parent f01e33f152 e1b6e11c72
commit cdd03d6d65
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1250,6 +1250,8 @@ public class Vpn {
updateState(DetailedState.CONNECTING, "agentConnect"); updateState(DetailedState.CONNECTING, "agentConnect");
final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder() final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder()
.setLegacyType(ConnectivityManager.TYPE_VPN)
.setLegacyTypeName("VPN")
.setBypassableVpn(mConfig.allowBypass && !mLockdown) .setBypassableVpn(mConfig.allowBypass && !mLockdown)
.build(); .build();