commit c3ef1054b7da7c664609a984306f42a905d352a4
author Maciej Żenczykowski <maze@google.com> Tue Jul 23 18:09:04 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 23 18:09:04 2024 +0000
tree cb332033010195693b28b3c79b1df0e3cacd1f60
parent 112a51308f6f3c3946e5b5196b53aa710b9f1579
parent 88dc9c06f6c3b4f7b3366684aa58d35a47da32a4

Merge "Clear all APF memory in testDropPingReply() in preparing stage" into main am: 88dc9c06f6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3189850

Change-Id: Ie7380ee390c72d640da5bb17f01ae6d5c2f96928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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