commit 253521d294e3f09801f79eb5d379e1582a69b6aa
author James Mattis <jmattis@google.com> Sat Apr 03 22:20:38 2021 -0700
committer James Mattis <jmattis@google.com> Mon May 31 11:26:03 2021 -0700
tree d63d8afa031c9831f9b54e4917805bbe420be5e3
parent f8c12829c69bf0d9d15a209b7c73d28a23517243

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

Change-Id: I5ba142f601f3942d6e6ec4106fc0e70012b42a49

staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt

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