From df7736245f7fe92810da2037b6b250b0efa65259 Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Fri, 8 Dec 2023 17:21:55 -0800 Subject: [PATCH] Add capability bit for the cached scan data feature Test: compilation Bug: 269485350 Change-Id: I94fe5ae67a777bec955794ccd4dba7ea43b3c9aa --- .../current/android/hardware/wifi/IWifiStaIface.aidl | 1 + wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl | 4 ++++ wifi/aidl/default/aidl_struct_util.cpp | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl index f8384130b2..bf4c2c0502 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl @@ -79,5 +79,6 @@ interface IWifiStaIface { ND_OFFLOAD = (1 << 12) /* 4096 */, KEEP_ALIVE = (1 << 13) /* 8192 */, ROAMING_MODE_CONTROL = (1 << 14) /* 16384 */, + CACHED_SCAN_DATA = (1 << 15) /* 32768 */, } } diff --git a/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl b/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl index 3c8b55fa03..03b22179d0 100644 --- a/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl +++ b/wifi/aidl/android/hardware/wifi/IWifiStaIface.aidl @@ -104,6 +104,10 @@ interface IWifiStaIface { * Support for configuring roaming mode. */ ROAMING_MODE_CONTROL = 1 << 14, + /** + * Support for cached scan data report. + */ + CACHED_SCAN_DATA = 1 << 15, } /** diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index cd2ae119bc..ad0ed79927 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -96,6 +96,8 @@ IWifiStaIface::FeatureSetMask convertLegacyStaIfaceFeatureToAidl(uint64_t featur return IWifiStaIface::FeatureSetMask::KEEP_ALIVE; case WIFI_FEATURE_ROAMING_MODE_CONTROL: return IWifiStaIface::FeatureSetMask::ROAMING_MODE_CONTROL; + case WIFI_FEATURE_CACHED_SCAN_RESULTS: + return IWifiStaIface::FeatureSetMask::CACHED_SCAN_DATA; }; CHECK(false) << "Unknown legacy feature: " << feature; return {}; @@ -463,7 +465,7 @@ bool convertLegacyStaIfaceFeaturesToAidl(uint64_t legacy_feature_set, uint32_t* WIFI_FEATURE_CONTROL_ROAMING, WIFI_FEATURE_IE_WHITELIST, WIFI_FEATURE_SCAN_RAND, WIFI_FEATURE_INFRA_5G, WIFI_FEATURE_HOTSPOT, WIFI_FEATURE_PNO, WIFI_FEATURE_TDLS, WIFI_FEATURE_TDLS_OFFCHANNEL, WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE, - WIFI_FEATURE_ROAMING_MODE_CONTROL}) { + WIFI_FEATURE_ROAMING_MODE_CONTROL, WIFI_FEATURE_CACHED_SCAN_RESULTS}) { if (feature & legacy_feature_set) { *aidl_feature_set |= static_cast(convertLegacyStaIfaceFeatureToAidl(feature)); }