commit bc4498f3d1aef7bcd8951fe1142c1b0ce3bac2cc
author Yuyang Huang <yuyanghuang@google.com> Mon Feb 19 16:55:53 2024 +0900
committer David Lin <dlinls@google.com> Thu Mar 28 08:02:50 2024 +0000
tree d75ed3860a263c02b15032603279c6591ffdf70a
parent c48341706e21b4489fbb401105300b6f63af1ce7

Adapt CheckApfIsSupported for VSR-15 compatibility

This commit updates CheckApfIsSupported to align with VSR-15
requirements. APF should have minimum of 2000 bytes usable memory.

Bug: <303356901>
Test: TH
(cherry picked from https://android-review.googlesource.com/q/commit:641f0aed53c80751a8f19e551c522d7c4671691f)
Merged-In: I2a2dbc22e1532fcb11ab256830cecba9f6c54446
Change-Id: I2a2dbc22e1532fcb11ab256830cecba9f6c54446
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.

wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp

diff --git a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
index e8b2d57..c87fe13 100644
--- a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
+++ b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp
@@ -176,14 +176,18 @@
         }
         StaApfPacketFilterCapabilities apf_caps = {};
         EXPECT_TRUE(wifi_sta_iface_->getApfPacketFilterCapabilities(&apf_caps).isOk());
-    } else {
-        EXPECT_TRUE(isFeatureSupported(IWifiStaIface::FeatureSetMask::APF));
-        StaApfPacketFilterCapabilities apf_caps = {};
-        EXPECT_TRUE(wifi_sta_iface_->getApfPacketFilterCapabilities(&apf_caps).isOk());
-        // The APF version must be 4 or higher and the usable memory must be at least
-        // 1024 bytes.
-        EXPECT_GE(apf_caps.version, 4);
-        EXPECT_GE(apf_caps.maxLength, 1024);
+        return;
+    }
+
+    EXPECT_TRUE(isFeatureSupported(IWifiStaIface::FeatureSetMask::APF));
+    StaApfPacketFilterCapabilities apf_caps = {};
+    EXPECT_TRUE(wifi_sta_iface_->getApfPacketFilterCapabilities(&apf_caps).isOk());
+    EXPECT_GE(apf_caps.version, 4);
+    // Based on VSR-14 the usable memory must be at least 1024 bytes.
+    EXPECT_GE(apf_caps.maxLength, 1024);
+    if (vendor_api_level >= __ANDROID_API_V__) {
+        // Based on VSR-15 the usable memory must be at least 2000 bytes.
+        EXPECT_GE(apf_caps.maxLength, 2000);
     }
 }