From 88c3272d0eff26662d47720004ce3696e3ed1e78 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 16 Feb 2017 12:43:17 -0800 Subject: [PATCH] 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 --- wifi/1.0/default/hidl_struct_util.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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(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,