diff options
author | Ahmed ElArabawy <arabawy@google.com> | 2019-12-09 15:24:16 -0800 |
---|---|---|
committer | Ahmed ElArabawy <arabawy@google.com> | 2019-12-12 16:37:36 -0800 |
commit | b23485ddc58945200de6d9923f3d2c3984d8ccca (patch) | |
tree | 5a5dbd782ac63acec75c749d121ad91c4b096c79 /wifi/1.4/default/hidl_struct_util.cpp | |
parent | ad84668d2928fae960940870e4138af8377f70b8 (diff) |
Remove 6GHz capability query through HAL
It was decided to perform the check on the device support of 6GHz
through overlay configs instead of through HAL.
This commit removes the Hidl API changes that were used for that
check.
Bug: 145936758
Bug: 139354972
Test: Manual
Test: VTS test
Test: Unit test: hardware/interfaces/wifi/1.4/default/tests/runtests.sh
Change-Id: I81fdf603a668a71e3e875211367111fffee20e54
Diffstat (limited to 'wifi/1.4/default/hidl_struct_util.cpp')
-rw-r--r-- | wifi/1.4/default/hidl_struct_util.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wifi/1.4/default/hidl_struct_util.cpp b/wifi/1.4/default/hidl_struct_util.cpp index 45ffdde19d..4996e358b2 100644 --- a/wifi/1.4/default/hidl_struct_util.cpp +++ b/wifi/1.4/default/hidl_struct_util.cpp @@ -120,8 +120,6 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint64_t feature) { return HidlStaIfaceCaps::ND_OFFLOAD; case WIFI_FEATURE_MKEEP_ALIVE: return HidlStaIfaceCaps::KEEP_ALIVE; - case WIFI_FEATURE_INFRA_6G: - return HidlStaIfaceCaps::STA_6G; }; CHECK(false) << "Unknown legacy feature: " << feature; return {}; @@ -394,8 +392,7 @@ bool convertLegacyFeaturesToHidlStaCapabilities( 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_INFRA_6G}) { + WIFI_FEATURE_CONFIG_NDO, WIFI_FEATURE_MKEEP_ALIVE}) { if (feature & legacy_feature_set) { *hidl_caps |= convertLegacyFeatureToHidlStaIfaceCapability(feature); } |