| commit | 53be7c9c5a5723fcbc2fc755d5431fb31d9aea28 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 12 04:20:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 12 04:20:32 2022 +0000 |
| tree | bd9815d308c7277e83b5d6826b06add592eb3c74 | |
| parent | bbd24de7c66b67554ead657bbb66f24ed2930e93 [diff] | |
| parent | dbc83e32c796e64aca5a32a9cd9d39754ade86d7 [diff] |
Merge "Fix teardown crash when kernel version < 5.4" am: 03c8a7a6a1 am: dbc83e32c7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2061767 Change-Id: Idb1660894644b45b7e34f9d3b4e066f0821123f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt index 9cd8418..e8add6b 100644 --- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt +++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
@@ -146,6 +146,9 @@ @After fun tearDown() { + if (!kernelIsAtLeast(5, 4)) { + return; + } agentsToCleanUp.forEach { it.unregister() } callbacksToCleanUp.forEach { cm.unregisterNetworkCallback(it) }