From ded9b18406425dce5c8969889fd5531a6c8a9ea0 Mon Sep 17 00:00:00 2001
From: junyulai <junyulai@google.com>
Date: Thu, 28 Jan 2021 14:59:50 +0800
Subject: [PATCH] [VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent
 implementations

Follow-up from aosp/1549897, the capability will not be in
default capabilities, but will be in most of the NetworkRequests
which requires internet. Thus, add the capabilities into all
NetworkAgent implementations by default to provide
backward compatibility.

Test: TH
Bug: 175662146
Change-Id: Id706fea7ac3136779e51853956bc1251f1f54611
---
 services/core/java/com/android/server/connectivity/Vpn.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 80944773c2c4b..b455a3f4169fd 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -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);
     }