| commit | 68f5c767ef2ea2cc0bb3c387645cc21ef7f3e22a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 01 11:50:52 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 01 11:50:52 2022 +0000 |
| tree | b9fc64442b071f75499e92d107d9d6b2fb73bb4e | |
| parent | 12ec920ebda8af93dac7048d1c8f6ec1382b8a22 [diff] | |
| parent | d6b408b9cf798724a74b4cd3d68ba25ced726306 [diff] |
Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 am: 2db0cc10bb am: d6b408b9cf Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965080 Change-Id: Icc366aa3bc3eabfb11f84a51add49eb66b4d753a
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 +}