| commit | f0ab71b893132685bedfd4b30ae0ba424755d4cc | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jun 08 01:42:40 2021 +0000 |
| committer | Junyu Lai <junyulai@google.com> | Wed Jun 09 08:06:57 2021 +0000 |
| tree | fb024775cdb827f6186bbfdddce7b8bf4d5b5a58 | |
| parent | d82cead257b3c9cb804d3e284aa9ac3303a76817 [diff] |
Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES Test: atest FrameworksNetTests Bug: 189809600 Merged-In: Ice1d0b87ed40bd5991217fe9d7b0c919a82d8acc Change-Id: Ice1d0b87ed40bd5991217fe9d7b0c919a82d8acc (cherry-picked from ag/14883335)
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index 4c7d675..3ec0b62 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -133,7 +133,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); /**