diff options
author | Junyu Lai <junyulai@google.com> | 2021-06-08 01:42:40 +0000 |
---|---|---|
committer | Junyu Lai <junyulai@google.com> | 2021-06-08 01:42:40 +0000 |
commit | 620d14c43f11164a8301b26f7ece73a3ababba64 (patch) | |
tree | 21f51e6db321541439306a69d730033d9797ec8f | |
parent | 953bee439c34b451b46028e540ae6c072a4d1156 (diff) | |
download | net-620d14c43f11164a8301b26f7ece73a3ababba64.tar.gz |
Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES
Ignore-AOSP-First: Counter part CL is in internal branch
Test: atest FrameworksNetTests
Bug: 189809600
Change-Id: Ice1d0b87ed40bd5991217fe9d7b0c919a82d8acc
-rw-r--r-- | common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java | 3 |
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); /** |