| commit | c9808887271c4c05261caec616fe343e4a3b6ba9 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Jun 09 10:27:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 09 10:27:48 2021 +0000 |
| tree | 421d371dc5beb423ba2cd421abb613cbf409aa71 | |
| parent | aee3e885f75c44293905949d8270146e369a60bc [diff] | |
| parent | 548d0e0c21c09338a3c7fa584898424a0753c827 [diff] |
Merge "Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES" am: 428d213add Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1730119 Change-Id: I89f8ea768ad159812ffc26f9b0c2a311a8aac3fd
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); /**