diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-18 01:07:45 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-18 01:07:45 +0000 |
| commit | ce1e3838f2a3ef83a86ede81cb385383f7aae02a (patch) | |
| tree | 8da46b441e0a2d3cb645586ffee47761a3359fde | |
| parent | a0f16aab0007c4b7f83e155b37e7acf155448ac0 (diff) | |
| parent | f744e7681fda503d6b94cf7547e5dd80dd37e050 (diff) | |
| download | net-ce1e3838f2a3ef83a86ede81cb385383f7aae02a.tar.gz | |
Snap for 7468789 from f744e7681fda503d6b94cf7547e5dd80dd37e050 to sc-release
Change-Id: Ic90fc0b2377006417cbeb09ae1fc021a6f1fd0a5
| -rw-r--r-- | common/native/bpf_syscall_wrappers/Android.bp | 1 | ||||
| -rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/native/bpf_syscall_wrappers/Android.bp b/common/native/bpf_syscall_wrappers/Android.bp index fa906554..befb9f8f 100644 --- a/common/native/bpf_syscall_wrappers/Android.bp +++ b/common/native/bpf_syscall_wrappers/Android.bp @@ -35,5 +35,6 @@ cc_library_headers { visibility: [ "//packages/modules/Connectivity/Tethering", "//system/bpf/libbpf_android", + "//system/memory/lmkd", ], } diff --git a/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt b/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt index 5b978617..d8dd67a3 100644 --- a/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt +++ b/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt @@ -51,7 +51,7 @@ fun initTestNetwork(context: Context, interfaceAddr: LinkAddress, setupTimeoutMs 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 @@ class TestNetworkTracker internal constructor( fun teardown() { cm.unregisterNetworkCallback(networkCallback) + tnm.teardownTestNetwork(network) } }
\ No newline at end of file |