diff options
| author | Junyu Lai <junyulai@google.com> | 2021-06-09 08:21:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 08:21:14 +0000 |
| commit | 6418cfeabaa6e7fcba353fb89d779e79ba34b4c3 (patch) | |
| tree | 21f51e6db321541439306a69d730033d9797ec8f | |
| parent | 29fef1e039dc3996bab854c27cafc7f435973ed0 (diff) | |
| parent | 620d14c43f11164a8301b26f7ece73a3ababba64 (diff) | |
| download | net-6418cfeabaa6e7fcba353fb89d779e79ba34b4c3.tar.gz | |
Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES am: 620d14c43f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/14883335
Change-Id: I62265dbd3bff378652fd75cafc137741c38671dd
| -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); /** |