commit | bb6441aa077b49d19fab9af0b1cde37e76a97eb8 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Jun 16 01:30:05 2021 +0000 |
committer | James Mattis <jmattis@google.com> | Wed Jun 16 03:56:37 2021 +0000 |
tree | 38a013e3e64537506040f993d27a0f2904084458 | |
parent | d175ef994f9dde08707a2a8b0d33192375adad17 [diff] |
Update TestNetworkTracker tearDown() Update to TestNetworkTracker tearDown() to call TestNetworkManager to tear down the current test network. Bug: 176496580 Bug: 176494815 Test: atest FrameworksNetTests atest NetworkStackTests atest FrameworksNetIntegrationTests atest NetworkStackIntegrationTests atest CtsNetTestCasesLatestSdk Original-Change: https://android-review.googlesource.com/1663785 Merged-In: I5ba142f601f3942d6e6ec4106fc0e70012b42a49 Change-Id: I5ba142f601f3942d6e6ec4106fc0e70012b42a49
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