commit 355670c19612b43b73d496fee4b4fc7d4c13bf01
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 06 22:06:38 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 06 22:06:38 2024 +0000
tree 27347f5d078e2fa1010319004c7d44140b16f466
parent 5af29c81b3061df39df4b41ab5d97bde5df331c2
parent 732278a3b459b118bdd53940cf72db0650b5b6ee

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28534890'] into 24Q3-release.

Change-Id: Ie8700712270e68c4f0eedac6a5262f482364850b

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 d233fee..764f117 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -420,8 +420,7 @@
         assumeApfVersionSupportAtLeast(4)
 
         // clear any active APF filter
-        var gen = ApfV4Generator(4).addPass()
-        installProgram(gen.generate())
+        clearApfMemory()
         readProgram() // wait for install completion
 
         // Assert that initial ping does not get filtered.
@@ -435,7 +434,7 @@
         assertThat(packetReader.expectPingReply()).isEqualTo(data)
 
         // Generate an APF program that drops the next ping
-        gen = ApfV4Generator(4)
+        val gen = ApfV4Generator(4)
 
         // If not ICMPv6 Echo Reply -> PASS
         gen.addPassIfNotIcmpv6EchoReply()