| commit | b3379da39cea3e4e78afba3b09ee2d24be3394ac | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jun 16 01:30:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 16 01:30:05 2021 +0000 |
| tree | eb71832f7873e7ab6833abad6b4e528dceb99d71 | |
| parent | 51d44e6f61239f71ebb0ef1703087e01bc963185 [diff] | |
| parent | 6f806ae9a2701bda2c8d59b6af55c5f0cd66251c [diff] |
Merge "Update TestNetworkTracker tearDown()" am: cb9d36876e am: 771421d00e Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1663785 Change-Id: I5693d4b25c07dc531353b42c328307528b2d6aac
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