commit 4f804964092fb206787b4e12d9484e9507fc6a3c
author Chiachang Wang <chiachangwang@google.com> Thu Mar 25 12:07:27 2021 +0800
committer Aaron Huang <huangaaron@google.com> Wed Mar 31 16:43:53 2021 +0800
tree 84cdc6bce9363fd03098e60bd6159772efe54966
parent d7830e3ddc52df20a05dc702409d8fa4e366ccf0

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

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 568a356..9e4a161 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;
@@ -80,17 +82,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.