| commit | 0f3173473a213fa20b92fd1b90bca272ad6cdbda | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 12 04:04:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 12 04:04:29 2022 +0000 |
| tree | 60bfd893dc549839805d925023e9c5b85c715b51 | |
| parent | 8dc4a2b14dac9deba3e190453fdf7c29a23a5b40 [diff] | |
| parent | 03c8a7a6a19549fb22507f2ec503dc43f9cfe3b9 [diff] |
Merge "Fix teardown crash when kernel version < 5.4" am: 03c8a7a6a1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2061767 Change-Id: I13b8706fbf1c7ff5c4392acfff52dde3871b0835 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) }