commit 88dc9c06f6c3b4f7b3366684aa58d35a47da32a4
author Maciej Żenczykowski <maze@google.com> Tue Jul 23 17:56:13 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 17:56:13 2024 +0000
tree c2307c2aaf1d6b0df8c360fed5a430f1efe63311
parent 443d6d53ec248b0d90271cbf5928d04f13edd41a
parent e749694eb49fa74236d2388faeafd04c725fb461

Merge "Clear all APF memory in testDropPingReply() in preparing stage" into main

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

diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
index 5662fca..710f0fb 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -436,12 +436,7 @@
         assumeApfVersionSupportAtLeast(4)
 
         // clear any active APF filter
-        var gen = ApfV4Generator(
-                caps.apfVersionSupported,
-                caps.maximumApfProgramSize,
-                caps.maximumApfProgramSize
-        ).addPass()
-        installProgram(gen.generate())
+        clearApfMemory()
         readProgram() // wait for install completion
 
         // Assert that initial ping does not get filtered.
@@ -455,7 +450,7 @@
         assertThat(packetReader.expectPingReply()).isEqualTo(data)
 
         // Generate an APF program that drops the next ping
-        gen = ApfV4Generator(
+        val gen = ApfV4Generator(
                 caps.apfVersionSupported,
                 caps.maximumApfProgramSize,
                 caps.maximumApfProgramSize