| commit | a4509f058cfa3cc67eba504f0b4d0c08cce66eb0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 01 11:40:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 01 11:40:09 2022 +0000 |
| tree | 3648b30751d9f9c0bd09caf2bd9ab09bb021102f | |
| parent | 05498f5e15b36b521a85ba96940deef4090f2a7a [diff] | |
| parent | 4d9a4e8b00ce319294938e04fa109f7e324ad42c [diff] |
Merge "Fix DscpPolicyTest EBADF" am: f36a025f38 am: 4d9a4e8b00 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965080 Change-Id: I9b0cf80ce5cee2cec41f75abb79f9ddf0fd1381a
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 +}