| commit | 2db0cc10bbfc2866ba308b0c3a45ce0730bc06ab | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 01 11:24:19 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 01 11:24:19 2022 +0000 |
| tree | b1064a3fc5232aaff1635e5d0ddf6b788dc155bd | |
| parent | 1466f906075142e119b694991e244048ff85fd06 [diff] | |
| parent | f36a025f384a5a9a1423f84577913321af8ec90d [diff] |
Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965080 Change-Id: I41437a71a90d236d496c5d6e470e2154ea7932cf
diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt index 1f39fee..886b078 100644 --- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt +++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
@@ -146,8 +146,9 @@ fun tearDown() { agentsToCleanUp.forEach { it.unregister() } callbacksToCleanUp.forEach { cm.unregisterNetworkCallback(it) } + + // reader.stop() cleans up tun fd reader.handler.post { reader.stop() } - Os.close(iface.fileDescriptor.fileDescriptor) handlerThread.quitSafely() } @@ -519,4 +520,4 @@ private fun <T> Context.assertHasService(manager: Class<T>): T { return getSystemService(manager) ?: fail("Service $manager not found") -} \ No newline at end of file +}