commit 60abccce2589e50e93a9d9b5af22b904c16fc96c
author Hongguang <hgchen@google.com> Mon Apr 11 11:52:55 2022 -0700
committer Hongguang Chen <hgchen@google.com> Tue Apr 12 00:10:32 2022 +0000
tree c1d38b6a72e5cae2f135f21f1185bbfb20fdb85c
parent b3bf5fedab4978bea49fd049beb1b3bf19626224

Fix teardown crash when kernel version < 5.4

Fix: 228821216
Test: atest android.net.cts.DscpPolicyTest
Change-Id: I341a5d7399c317dab975580b074a232976f581f2

tests/cts/net/src/android/net/cts/DscpPolicyTest.kt

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) }