Break the reference for the new added API constant
RESTRICTED_CAPABILITIES was moved from NetworkCapabilities to
frameworks/libs/net. RESTRICTED_CAPABILITIES refers to some
S added NET_CAPABILITIES_* definitions. Replace the constants
definitions with local constants because this git will
downstream to branches without this constants. Downstream will
not be able to find the references in NetworkCapailities and
cause breakage.
Bug: 178777253
Bug: 130869457
Test: m
Change-Id: I270593c12c1a7ff9f05d3bcd5f6d5647f89efb63
Ignore-AOSP-First: code conflict
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index e51c5f2..0d2ad01 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -16,11 +16,9 @@
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;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_ENTERPRISE;
import static android.net.NetworkCapabilities.NET_CAPABILITY_FOTA;
import static android.net.NetworkCapabilities.NET_CAPABILITY_IA;
import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS;
@@ -28,11 +26,8 @@
import static android.net.NetworkCapabilities.NET_CAPABILITY_MCX;
import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS;
import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;
-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;
@@ -77,6 +72,43 @@
};
/**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_OEM_PRIVATE = 26;
+
+ /**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_VEHICLE_INTERNAL
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27;
+
+ /**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;
+
+ /**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_ENTERPRISE = 29;
+
+ /**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_VSIM
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_VSIM = 30;
+
+ /**
+ * @See android.net.NetworkCapabilities.NET_CAPABILITY_BIP
+ * TODO: Use API constant when all downstream branches are S-based
+ */
+ public static final int NET_CAPABILITY_BIP = 31;
+
+
+ /**
* Capabilities that suggest that a network is restricted.
* See {@code NetworkCapabilities#maybeMarkCapabilitiesRestricted},
* and {@code FORCE_RESTRICTED_CAPABILITIES}.