| commit | d175ef994f9dde08707a2a8b0d33192375adad17 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jun 08 01:42:40 2021 +0000 |
| committer | Junyu Lai <junyulai@google.com> | Tue Jun 08 01:42:40 2021 +0000 |
| tree | dc37a103be95aeb3181e752f9fbe0eb9190d0431 | |
| parent | 82ab3096eab1cd35a86568a31d26e6b6d15590fc [diff] |
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
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index 122b499..d4b1c9e 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -141,7 +141,8 @@ * 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); /**