Merge "Report mock measurements consistent with SvInfo" into main
diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp
index 8bc9d1a..87e6d95 100644
--- a/wifi/aidl/default/aidl_struct_util.cpp
+++ b/wifi/aidl/default/aidl_struct_util.cpp
@@ -66,6 +66,8 @@
return IWifiChip::FeatureSetMask::SET_VOIP_MODE;
case WIFI_FEATURE_MLO_SAP:
return IWifiChip::FeatureSetMask::MLO_SAP;
+ case WIFI_FEATURE_MULTIPLE_MLD_ON_SAP:
+ return IWifiChip::FeatureSetMask::MULTIPLE_MLD_ON_SAP;
};
CHECK(false) << "Unknown legacy feature: " << feature;
return {};
@@ -122,7 +124,8 @@
WIFI_FEATURE_P2P_RAND_MAC,
WIFI_FEATURE_AFC_CHANNEL,
WIFI_FEATURE_SET_VOIP_MODE,
- WIFI_FEATURE_MLO_SAP};
+ WIFI_FEATURE_MLO_SAP,
+ WIFI_FEATURE_MULTIPLE_MLD_ON_SAP};
for (const auto feature : features) {
if (feature & legacy_feature_set) {
*aidl_feature_set |= static_cast<uint32_t>(convertLegacyChipFeatureToAidl(feature));
diff --git a/wifi/legacy_headers/include/hardware_legacy/wifi_hal.h b/wifi/legacy_headers/include/hardware_legacy/wifi_hal.h
index dbcc152..4cabbe4 100644
--- a/wifi/legacy_headers/include/hardware_legacy/wifi_hal.h
+++ b/wifi/legacy_headers/include/hardware_legacy/wifi_hal.h
@@ -499,6 +499,8 @@
#define WIFI_FEATURE_SET_VOIP_MODE (uint64_t)0x1000000000 // Support Voip mode setting
#define WIFI_FEATURE_CACHED_SCAN_RESULTS (uint64_t)0x2000000000 // Support cached scan result report
#define WIFI_FEATURE_MLO_SAP (uint64_t)0x4000000000 // Support MLO SoftAp
+#define WIFI_FEATURE_MULTIPLE_MLD_ON_SAP \
+ (uint64_t)0x8000000000 // Support Multiple MLD SoftAp (Bridged Dual 11be SoftAp)
// Add more features here
#define IS_MASK_SET(mask, flags) (((flags) & (mask)) == (mask))