| commit | 548d0e0c21c09338a3c7fa584898424a0753c827 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Jun 09 10:15:09 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 09 10:15:09 2021 +0000 |
| tree | 421d371dc5beb423ba2cd421abb613cbf409aa71 | |
| parent | 5bda7e143c923348ef960aec06cffc416b3d4a80 [diff] | |
| parent | f0ab71b893132685bedfd4b30ae0ba424755d4cc [diff] |
Merge "Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES"
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index 552ab21..382ed9f 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -134,7 +134,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); /**