| commit | 31522e92b49c256176af54c800c25ea252b62712 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <[email protected]> | Sat Jan 30 02:00:20 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Jan 30 02:00:20 2021 +0000 |
| tree | 2e42c930763c8ba3071244137e6d446c515a80de | |
| parent | 3a91a2fdc2b865937f1019b41bffcfda35c91b95 [diff] | |
| parent | ac0dbac04cbbad0a8a66c83ccad99149b07177a9 [diff] |
Merge "[VCN07.6] Add NOT_VCN_MANAGED for NetworkAgent implementations" am: ac0dbac04c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562877 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If92b70b62029571082bba8e823d115cee2860a8d
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 8094477..b455a3f 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 @@ 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); }