diff options
| author | Roshan Pius <rpius@google.com> | 2017-02-16 12:43:17 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-02-16 12:50:08 -0800 |
| commit | 88c3272d0eff26662d47720004ce3696e3ed1e78 (patch) | |
| tree | 6271a57c3e5116792c420091b3d01427dd7df867 /wifi/1.0/default/hidl_struct_util.cpp | |
| parent | 6283d249f948d41640658db417ba987b26e0378a (diff) | |
wifi(implementation): Initialize flags before conversion
There are a few flags which were not being reset before conversion in
hidl_struct_util.cpp. Fix those.
Bug: 35432118
Test: Compiles & tested with calling code changes.
Change-Id: If652ceed856cacf412f4dbf8eedbc351d04b6b89
Diffstat (limited to 'wifi/1.0/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.0/default/hidl_struct_util.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index e57919d241..4dd1ba63f0 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -134,6 +134,7 @@ bool convertLegacyDebugRingBufferStatusToHidl( return false; } hidl_status->ringName = reinterpret_cast<const char*>(legacy_status.name); + hidl_status->flags = 0; for (const auto flag : {WIFI_RING_BUFFER_FLAG_HAS_BINARY_ENTRIES, WIFI_RING_BUFFER_FLAG_HAS_ASCII_ENTRIES}) { if (flag & legacy_status.flags) { @@ -457,6 +458,7 @@ bool convertLegacyCachedGscanResultsToHidl( if (!hidl_scan_data) { return false; } + hidl_scan_data->flags = 0; for (const auto flag : {legacy_hal::WIFI_SCAN_FLAG_INTERRUPTED}) { if (legacy_cached_scan_result.flags & flag) { hidl_scan_data->flags |= @@ -1749,6 +1751,7 @@ bool convertLegacyRttCapabilitiesToHidl( hidl_capabilities->lcrSupported = legacy_capabilities.lcr_support; hidl_capabilities->responderSupported = legacy_capabilities.responder_supported; + hidl_capabilities->preambleSupport = 0; for (const auto flag : {legacy_hal::WIFI_RTT_PREAMBLE_LEGACY, legacy_hal::WIFI_RTT_PREAMBLE_HT, legacy_hal::WIFI_RTT_PREAMBLE_VHT}) { @@ -1758,6 +1761,7 @@ bool convertLegacyRttCapabilitiesToHidl( convertLegacyRttPreambleToHidl(flag)); } } + hidl_capabilities->bwSupport = 0; for (const auto flag : {legacy_hal::WIFI_RTT_BW_5, legacy_hal::WIFI_RTT_BW_10, legacy_hal::WIFI_RTT_BW_20, |