From 641f0aed53c80751a8f19e551c522d7c4671691f Mon Sep 17 00:00:00 2001 From: Yuyang Huang Date: Mon, 19 Feb 2024 16:55:53 +0900 Subject: [PATCH] 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 Change-Id: I2a2dbc22e1532fcb11ab256830cecba9f6c54446 --- .../functional/wifi_sta_iface_aidl_test.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 2ee960f944..d3687159db 100644 --- a/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp +++ b/wifi/aidl/vts/functional/wifi_sta_iface_aidl_test.cpp @@ -171,14 +171,18 @@ TEST_P(WifiStaIfaceAidlTest, CheckApfIsSupported) { } 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); } }