Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am: 11cea0d4a3

Browse Source 
am: a80d8de804

Change-Id: I103c555c1d9580d056800a1d1e28ef9b27780b2d
This commit is contained in:
Etan Cohen
2017-02-10 23:21:16 +00:00
committed by android-build-merger
parent 07d3618832 a80d8de804
commit 98bd5591b6
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/1.0/default/hidl_struct_util.cpp
View File

@@ -787,6 +787,7 @@ 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_rssi_window_size = 1;
legacy_request->rssi_window_size_val = hidl_request.configParams.rssiWindowSize;
legacy_request->config_disc_mac_addr_randomization = 1;
@@ -1114,6 +1115,7 @@ 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_rssi_window_size = 1;
legacy_request->rssi_window_size_val = hidl_request.rssiWindowSize;
legacy_request->config_disc_mac_addr_randomization = 1;

12
wifi/1.0/types.hal
View File

@@ -822,6 +822,18 @@ struct NanConfigRequest {
* Value must fit within 7 bits - i.e. <= 127.
*/
uint8_t numberOfPublishServiceIdsInBeacon;
/**
* Control whether subscribe service IDs are included in Sync/Discovery beacons.
* Spec: Subscribe Service ID List Attribute
*/
bool includeSubscribeServiceIdsInBeacon;
/**
* If |includeSubscribeServiceIdsInBeacon| is true then specifies the number of subscribe service
* IDs to include in the Sync/Discovery beacons:
* Value = 0: include as many service IDs as will fit into the maximum allowed beacon frame size.
* Value must fit within 7 bits - i.e. <= 127.
*/
uint8_t numberOfSubscribeServiceIdsInBeacon;
/**
* Number of samples used to calculate RSSI.
*/