Commit 1d03de72 authored Jan 30, 2021 by Junyu Lai Committed by Automerger Merge Worker Jan 30, 2021

Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am:...

Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac0 am: 31522e92 am: c1f91600 am: 9548a0cd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b50e898d30f2fcda011cdfe3be26adb4a9bffe6

services/core/java/com/android/server/connectivity/Vpn.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}