diff options
| author | Etan Cohen <etancohen@google.com> | 2017-04-20 12:48:31 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-04-20 12:48:31 -0700 |
| commit | b0557b4783bd489eb1a44e4218db39379e5bc323 (patch) | |
| tree | 702b919494001446723b1f581986de235107590b /wifi/1.0/default/hidl_struct_util.cpp | |
| parent | eba30a25bc109e419be4169f5a901c8ebd7dfb09 (diff) | |
[AWARE] Configure the subscribe information in beacons
HAL (HIDL) contained configuration of subscriber ID in
discovery beacons (useful for higher probability of
discovery, better cluster selection & merging).
This CL modifies the implementation of the HAL to set
the (new) legacy HAL hooks from the HIDL values.
Bug: 35195516
Test: integration (sl4a) tests pass
Change-Id: I6dc84723a534aa9fd80ca93907f896af710e1e23
Diffstat (limited to 'wifi/1.0/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.0/default/hidl_struct_util.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp index 077dbb8f43..32206d8d5f 100644 --- a/wifi/1.0/default/hidl_struct_util.cpp +++ b/wifi/1.0/default/hidl_struct_util.cpp @@ -914,7 +914,14 @@ bool convertHidlNanEnableRequestToLegacy( legacy_request->sid_beacon_val = (hidl_request.configParams.includePublishServiceIdsInBeacon ? 0x1 : 0x0) | (hidl_request.configParams.numberOfPublishServiceIdsInBeacon << 1); - // TODO: b/35195516 connect SubscribeServiceIds to legacy HAL once implemented + legacy_request->config_subscribe_sid_beacon = 1; + if (hidl_request.configParams.numberOfSubscribeServiceIdsInBeacon > 127) { + LOG(ERROR) << "convertHidlNanEnableRequestToLegacy: numberOfSubscribeServiceIdsInBeacon > 127"; + return false; + } + legacy_request->subscribe_sid_beacon_val = + (hidl_request.configParams.includeSubscribeServiceIdsInBeacon ? 0x1 : 0x0) + | (hidl_request.configParams.numberOfSubscribeServiceIdsInBeacon << 1); legacy_request->config_rssi_window_size = 1; legacy_request->rssi_window_size_val = hidl_request.configParams.rssiWindowSize; legacy_request->config_disc_mac_addr_randomization = 1; @@ -1321,7 +1328,14 @@ bool convertHidlNanConfigRequestToLegacy( } legacy_request->sid_beacon = (hidl_request.includePublishServiceIdsInBeacon ? 0x1 : 0x0) | (hidl_request.numberOfPublishServiceIdsInBeacon << 1); - // TODO: b/35195516 connect SubscribeServiceIds to legacy HAL once implemented + legacy_request->config_subscribe_sid_beacon = 1; + if (hidl_request.numberOfSubscribeServiceIdsInBeacon > 127) { + LOG(ERROR) << "convertHidlNanConfigRequestToLegacy: numberOfSubscribeServiceIdsInBeacon > 127"; + return false; + } + legacy_request->subscribe_sid_beacon_val = + (hidl_request.includeSubscribeServiceIdsInBeacon ? 0x1 : 0x0) + | (hidl_request.numberOfSubscribeServiceIdsInBeacon << 1); legacy_request->config_rssi_window_size = 1; legacy_request->rssi_window_size_val = hidl_request.rssiWindowSize; legacy_request->config_disc_mac_addr_randomization = 1; |