| commit | 4d9a4e8b00ce319294938e04fa109f7e324ad42c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 01 11:24:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 01 11:24:07 2022 +0000 |
| tree | 535904490711d9ca32cfce275e25b907ef6582b0 | |
| parent | 7abb73ca834105b9e397e8d39f1218b6b2d305c6 [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: I77eab9e4319953aeb50b44abdece6ed0bc5015d5
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 +}