| commit | 45be14121e2a0a980478368eb6bf158c9f2d8433 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Jun 09 08:19:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 09 08:19:30 2021 +0000 |
| tree | 7a3bd73e90b88b642fc021ca6e92c515041193d0 | |
| parent | 41cf1be7798a00d6a711e8f951008c538e4a8fc7 [diff] | |
| parent | d175ef994f9dde08707a2a8b0d33192375adad17 [diff] |
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: I3b4e760a905385b78cc7df910eba11cc2d2c6eba
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); /**