diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-26 02:38:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-26 02:38:34 +0000 |
| commit | 3a90f3d4280373bc288f6db81f34482df2ad56be (patch) | |
| tree | cab197dd82b4d46dd7a830b4898322608bc8707e /common/framework/com | |
| parent | c80f7f3434e2a521c2c6d69cb08b6d27125bfd59 (diff) | |
| parent | c46551e62a20bc583488d70dd61f5caf28bbf804 (diff) | |
| download | net-3a90f3d4280373bc288f6db81f34482df2ad56be.tar.gz | |
Merge "Update new capabilities into restricted capabilities" into sc-dev
Diffstat (limited to 'common/framework/com')
| -rw-r--r-- | common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index 47b0fc86..e51c5f26 100644 --- a/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/common/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java @@ -16,6 +16,7 @@ package com.android.net.module.util; +import static android.net.NetworkCapabilities.NET_CAPABILITY_BIP; import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS; import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; import static android.net.NetworkCapabilities.NET_CAPABILITY_EIMS; @@ -31,6 +32,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE; import static android.net.NetworkCapabilities.NET_CAPABILITY_RCS; import static android.net.NetworkCapabilities.NET_CAPABILITY_SUPL; import static android.net.NetworkCapabilities.NET_CAPABILITY_VEHICLE_INTERNAL; +import static android.net.NetworkCapabilities.NET_CAPABILITY_VSIM; import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P; import static android.net.NetworkCapabilities.NET_CAPABILITY_XCAP; import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH; @@ -81,17 +83,19 @@ public final class NetworkCapabilitiesUtils { */ @VisibleForTesting static final long RESTRICTED_CAPABILITIES = - (1 << NET_CAPABILITY_CBS) + (1 << NET_CAPABILITY_BIP) + | (1 << NET_CAPABILITY_CBS) | (1 << NET_CAPABILITY_DUN) | (1 << NET_CAPABILITY_EIMS) + | (1 << NET_CAPABILITY_ENTERPRISE) | (1 << NET_CAPABILITY_FOTA) | (1 << NET_CAPABILITY_IA) | (1 << NET_CAPABILITY_IMS) | (1 << NET_CAPABILITY_MCX) | (1 << NET_CAPABILITY_RCS) | (1 << NET_CAPABILITY_VEHICLE_INTERNAL) - | (1 << NET_CAPABILITY_XCAP) - | (1 << NET_CAPABILITY_ENTERPRISE); + | (1 << NET_CAPABILITY_VSIM) + | (1 << NET_CAPABILITY_XCAP); /** * Capabilities that force network to be restricted. |