Merge "Supports to add a response for the given headers"
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index ec36608..f3b2faa 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -83,7 +83,11 @@
name: "net-utils-framework-common-srcs",
srcs: ["framework/**/*.java"],
path: "framework",
- visibility: ["//frameworks/base"],
+ visibility: [
+ "//frameworks/base",
+ "//packages/modules/Connectivity:__subpackages__",
+ "//frameworks/base/packages/Connectivity/framework",
+ ],
}
java_library {
diff --git a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
index 4fce8f5..0696cca 100644
--- a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
@@ -27,6 +27,7 @@
/**
* Utilities for {@link Collection} and arrays.
+ * @hide
*/
public final class CollectionUtils {
private CollectionUtils() {}
diff --git a/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java b/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
index 382912b..c135e46 100644
--- a/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/ConnectivityUtils.java
@@ -24,6 +24,7 @@
/**
* Various utilities used in connectivity code.
+ * @hide
*/
public final class ConnectivityUtils {
private ConnectivityUtils() {}
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index 4c7d675..382ed9f 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -44,6 +44,7 @@
/**
* Utilities to examine {@link android.net.NetworkCapabilities}.
+ * @hide
*/
public final class NetworkCapabilitiesUtils {
// Transports considered to classify networks in UI, in order of which transport should be
@@ -133,7 +134,8 @@
* See {@code NetworkCapabilities#maybeMarkCapabilitiesRestricted}.
*/
private static final long FORCE_RESTRICTED_CAPABILITIES =
- (1 << NET_CAPABILITY_OEM_PAID)
+ (1 << NET_CAPABILITY_ENTERPRISE)
+ | (1 << NET_CAPABILITY_OEM_PAID)
| (1 << NET_CAPABILITY_OEM_PRIVATE);
/**
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
index 94e6017..b641753 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkIdentityUtils.java
@@ -21,6 +21,7 @@
/**
* Utilities to examine {@link android.net.NetworkIdentity}.
+ * @hide
*/
public class NetworkIdentityUtils {
/**
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java b/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java
index b7062e7..f7151d7 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java
@@ -148,7 +148,10 @@
public static final int ICMPV6_ND_OPTION_RDNSS = 25;
public static final int ICMPV6_ND_OPTION_PREF64 = 38;
+ public static final int ICMPV6_RS_HEADER_LEN = 8;
public static final int ICMPV6_RA_HEADER_LEN = 16;
+ public static final int ICMPV6_NS_HEADER_LEN = 24;
+ public static final int ICMPV6_NA_HEADER_LEN = 24;
public static final int NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER = 1 << 31;
public static final int NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED = 1 << 30;
diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp
index fa90655..befb9f8 100644
--- a/staticlibs/native/bpf_syscall_wrappers/Android.bp
+++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp
@@ -35,5 +35,6 @@
visibility: [
"//packages/modules/Connectivity/Tethering",
"//system/bpf/libbpf_android",
+ "//system/memory/lmkd",
],
}
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
index 5b97861..d8dd67a 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
@@ -51,7 +51,7 @@
class TestNetworkTracker internal constructor(
val context: Context,
val iface: TestNetworkInterface,
- tnm: TestNetworkManager,
+ val tnm: TestNetworkManager,
setupTimeoutMs: Long
) {
private val cm = context.getSystemService(ConnectivityManager::class.java)
@@ -87,5 +87,6 @@
fun teardown() {
cm.unregisterNetworkCallback(networkCallback)
+ tnm.teardownTestNetwork(network)
}
}
\ No newline at end of file