diff options
author | Roshan Pius <rpius@google.com> | 2017-02-22 09:48:03 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2017-02-22 17:07:00 -0800 |
commit | 7f4574d2a1764df195ad9c16f149a73b93b825d3 (patch) | |
tree | f770a5b91dcc637cfbd28f25ec633e260cdfd2a9 /wifi/1.0/default/hidl_struct_util.cpp | |
parent | e54bcaee0b32b1fde10ee3c48ec3add20a03ac6f (diff) |
wifi: Duplicate getValidChannelsForBand in AP iface
This functionality is needed even for AP iface. So, duplicate this
method.
Changes in the CL:
1. Add getValidChannelsForBand() in IWifiApIface.
2. Rename StaBackgroundScanBan to WifiBand to make it a more generic
name.
3. Change the existing method name in IWifiStaIface to match with the
one in IWifiApIface.
While there,
Fix indentation in hidl_callback_util.h
Bug: 35663149
Test: Compiles
Change-Id: Iaeb6c323e13eedf2f98de92fea77e327c76ffa5b
Diffstat (limited to 'wifi/1.0/default/hidl_struct_util.cpp')
-rw-r--r-- | wifi/1.0/default/hidl_struct_util.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index 7dbc8ebbed..c7b8c41315 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -306,21 +306,21 @@ bool convertLegacyGscanCapabilitiesToHidl( return true; } -legacy_hal::wifi_band convertHidlGscanBandToLegacy(StaBackgroundScanBand band) { +legacy_hal::wifi_band convertHidlWifiBandToLegacy(WifiBand band) { switch (band) { - case StaBackgroundScanBand::BAND_UNSPECIFIED: + case WifiBand::BAND_UNSPECIFIED: return legacy_hal::WIFI_BAND_UNSPECIFIED; - case StaBackgroundScanBand::BAND_24GHZ: + case WifiBand::BAND_24GHZ: return legacy_hal::WIFI_BAND_BG; - case StaBackgroundScanBand::BAND_5GHZ: + case WifiBand::BAND_5GHZ: return legacy_hal::WIFI_BAND_A; - case StaBackgroundScanBand::BAND_5GHZ_DFS: + case WifiBand::BAND_5GHZ_DFS: return legacy_hal::WIFI_BAND_A_DFS; - case StaBackgroundScanBand::BAND_5GHZ_WITH_DFS: + case WifiBand::BAND_5GHZ_WITH_DFS: return legacy_hal::WIFI_BAND_A_WITH_DFS; - case StaBackgroundScanBand::BAND_24GHZ_5GHZ: + case WifiBand::BAND_24GHZ_5GHZ: return legacy_hal::WIFI_BAND_ABG; - case StaBackgroundScanBand::BAND_24GHZ_5GHZ_WITH_DFS: + case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS: return legacy_hal::WIFI_BAND_ABG_WITH_DFS; }; CHECK(false); |