diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-25 12:07:27 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2021-03-31 16:43:53 +0800 |
| commit | 6e8c1a48a45074002d26d18fcc318bf208b8b9e3 (patch) | |
| tree | d2429660d7e6948f47de20e04f2f4c5241e39188 /common/framework/com | |
| parent | e1687b57f21a9d9063313a131bbfccfd38477652 (diff) | |
| download | net-6e8c1a48a45074002d26d18fcc318bf208b8b9e3.tar.gz | |
Update new capabilities into restricted capabilities
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP are new restricted
capabiltity for carrier usage. Update them the
RESTRICTED_CAPABILITIES.
Bug: 130869457
Test: m
Change-Id: I20e3cf34634cf0c106560fc4173fcfb91d85724e
Merged-In: I20e3cf34634cf0c106560fc4173fcfb91d85724e
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 568a3561..9e4a161b 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; @@ -80,17 +82,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. |