commit 9a6732f96c59db3706dac4a696751b2e3f54fbef
author Chiachang Wang <chiachangwang@google.com> Fri Mar 26 02:38:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 26 02:38:34 2021 +0000
tree f9bdd9930f8cd6697a3d795eed9b81318c8fd618
parent e8c69746dab9c4e3892dedc0bf7ef258cc9da659
parent c8925dd6728e5e21b484361f3f455f61813da090

Merge "Update new capabilities into restricted capabilities" into sc-dev

staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java

diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index 47b0fc8..e51c5f2 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/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_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 @@
      */
     @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.