| commit | 03c8a7a6a19549fb22507f2ec503dc43f9cfe3b9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 12 03:43:21 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 12 03:43:21 2022 +0000 |
| tree | 04918abf0eeff880000c7c7aea1b702a40119459 | |
| parent | b11c913109496861940d5090cdda8b3e28991926 [diff] | |
| parent | 60abccce2589e50e93a9d9b5af22b904c16fc96c [diff] |
Merge "Fix teardown crash when kernel version < 5.4"
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) }