diff options
| author | Roshan Pius <rpius@google.com> | 2017-03-01 19:31:14 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-03-01 22:48:07 -0800 |
| commit | 208e46bbc2ab0c824dad366eaee318df09e6ca12 (patch) | |
| tree | 7c844aa412b58d8f2487ed7bf383a3053c624e9d /wifi/1.0/default/hidl_struct_util.cpp | |
| parent | 77c3822d6d1ba6068d56d90e3f040735c29b2afb (diff) | |
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
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, 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 82364cbe7e..6952e5563e 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<legacy_hal::wifi_band>(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<uint8_t>( 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()); |