[automerger skipped] Allow lmkd to use bpf_syscall_wrappers am: 30baaa0b24 -s ours
am skip reason: Merged-In Ia1f75852a853f62b504351271119714f3fd95232 with SHA-1 800c7d0661 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/14986081
Change-Id: I14780dfbde0a8a1dfb8febcdf6cdd8b17e8d1ac4
diff --git a/staticlibs/device/com/android/net/module/util/structs/NsHeader.java b/staticlibs/device/com/android/net/module/util/structs/NsHeader.java
index 6e0aa50..2e8b77b 100644
--- a/staticlibs/device/com/android/net/module/util/structs/NsHeader.java
+++ b/staticlibs/device/com/android/net/module/util/structs/NsHeader.java
@@ -50,8 +50,12 @@
@Field(order = 1, type = Type.Ipv6Address)
public Inet6Address target;
- public NsHeader(final Inet6Address target) {
- this.reserved = 0;
+ NsHeader(int reserved, final Inet6Address target) {
+ this.reserved = reserved;
this.target = target;
}
+
+ public NsHeader(final Inet6Address target) {
+ this(0, target);
+ }
}
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