summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-06-10 01:08:44 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-06-10 01:08:44 +0000
commit668ee1b58fb1f44d29932f50d3dd85f64852fdf3 (patch)
tree21f51e6db321541439306a69d730033d9797ec8f
parent0a98c646fba120a89704c09823da2334336d02ff (diff)
parent6418cfeabaa6e7fcba353fb89d779e79ba34b4c3 (diff)
downloadnet-668ee1b58fb1f44d29932f50d3dd85f64852fdf3.tar.gz
Snap for 7442307 from 6418cfeabaa6e7fcba353fb89d779e79ba34b4c3 to sc-v2-release
Change-Id: Iae0dff0e0ea729fe0cd980a24a675a7f8bbad4fe
-rw-r--r--common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index 122b4994..d4b1c9e0 100644
--- a/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -141,7 +141,8 @@ public final class NetworkCapabilitiesUtils {
* See {@code NetworkCapabilities#maybeMarkCapabilitiesRestricted}.
*/
private static final long FORCE_RESTRICTED_CAPABILITIES =
- (1 << NET_CAPABILITY_OEM_PAID)
+ (1 << NET_CAPABILITY_ENTERPRISE)
+ | (1 << NET_CAPABILITY_OEM_PAID)
| (1 << NET_CAPABILITY_OEM_PRIVATE);
/**