| commit | 2ea20d25acd649187e2e11fbfddbb81ac86fdf41 | [log] [tgz] |
|---|---|---|
| author | Yuyang Huang <yuyanghuang@google.com> | Thu May 30 03:35:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 30 03:35:46 2024 +0000 |
| tree | 9cd8d00ae7af6770e1387392821d8d62072572ae | |
| parent | d5ab1a152cca7e5074f4cde18c488acea48a5457 [diff] | |
| parent | 421aefadb9eda106337d1add700bcdd360abfd5f [diff] |
Merge "Run testFilterAgeIncreasesBetweenPacketstest() when VSR API is higher" into main am: 421aefadb9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3107618 Change-Id: I7134a8ea12e542ae8a926af6e9eb577db1ccd2ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt index 8710846..76cfc93 100644 --- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt +++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -498,6 +498,10 @@ @IgnoreUpTo(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) @Test fun testFilterAgeIncreasesBetweenPackets() { + // VSR-14 mandates APF to be turned on when the screen is off and the Wi-Fi link + // is idle or traffic is less than 10 Mbps. Before that, we don't mandate when the APF + // should be turned on. + assume().that(getVsrApiLevel()).isAtLeast(34) assumeApfVersionSupportAtLeast(4) clearApfMemory() val gen = ApfV4Generator(4)