From 208e46bbc2ab0c824dad366eaee318df09e6ca12 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 1 Mar 2017 19:31:14 -0800 Subject: [PATCH] wifi(implementation): Use strlen for size of ssid Looks like the legacy hal uses a null termination for indicating the size of ssid. While there, Use the helper function to convert wifi band from hidl to legacy. Bug: 35765841 Test: Integration tests pass now. Change-Id: Ie480f9d6735a21c5ccedfc68bfde5f0d920dcdc9 --- wifi/1.0/default/hidl_struct_util.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index 82364cbe..6952e556 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -350,7 +350,7 @@ bool convertHidlGscanParamsToLegacy( legacy_scan_params->buckets[bucket_idx]; legacy_bucket_spec.bucket = bucket_idx; legacy_bucket_spec.band = - static_cast(hidl_bucket_spec.band); + convertHidlWifiBandToLegacy(hidl_bucket_spec.band); legacy_bucket_spec.period = hidl_bucket_spec.periodInMs; legacy_bucket_spec.max_period = hidl_bucket_spec.exponentialMaxPeriodInMs; legacy_bucket_spec.base = hidl_bucket_spec.exponentialBase; @@ -429,7 +429,7 @@ bool convertLegacyGscanResultToHidl( hidl_scan_result->timeStampInUs = legacy_scan_result.ts; hidl_scan_result->ssid = std::vector( legacy_scan_result.ssid, - legacy_scan_result.ssid + sizeof(legacy_scan_result.ssid)); + legacy_scan_result.ssid + strlen(legacy_scan_result.ssid)); memcpy(hidl_scan_result->bssid.data(), legacy_scan_result.bssid, hidl_scan_result->bssid.size()); -- 2.11.0