diff options
| author | James Mattis <jmattis@google.com> | 2021-06-17 16:08:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-17 16:08:59 +0000 |
| commit | f744e7681fda503d6b94cf7547e5dd80dd37e050 (patch) | |
| tree | 8da46b441e0a2d3cb645586ffee47761a3359fde | |
| parent | 30baaa0b24b848e5eb5a20a98cf54362243cd9e6 (diff) | |
| parent | fdf190e1ebf4c7109629285df2e9215f190f5a43 (diff) | |
| download | net-f744e7681fda503d6b94cf7547e5dd80dd37e050.tar.gz | |
Merge "Update TestNetworkTracker tearDown()" into sc-dev
| -rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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 |