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

Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac04c am: 31522e92b4 am: c1f916005f am: 9548a0cd18

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b50e898d30f2fcda011cdfe3be26adb4a9bffe6
This commit is contained in:
Junyu Lai
2021-01-30 02:32:50 +00:00
committed by Automerger Merge Worker
parent 29e4b1b5e2 9548a0cd18
commit 1d03de729f
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

@@ -426,6 +426,7 @@ public class Vpn {
mNetworkCapabilities = new NetworkCapabilities();
mNetworkCapabilities.addTransportType(NetworkCapabilities.TRANSPORT_VPN);
mNetworkCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);
loadAlwaysOnPackage(keyStore);
}