commit 3b6de6e6db8e65e2453ed6b4b60d596c2003244b
author Etan Cohen <etancohen@google.com> Fri Feb 10 23:23:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 23:23:17 2017 +0000
tree e8344c99cc5acd0b00d5471652b451c593fa374b
parent f8dd4dfcddd6e32700555da9531139d6c1789b53
parent 98bd5591b686b329aac1214d2b69c3940cef32e2

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

Change-Id: Ibba393e4d34084234e44b667b072338257d61984

wifi/1.0/default/hidl_struct_util.cpp

diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp
index 28ad6c3..2343c2d 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -787,6 +787,7 @@
   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 @@
   }
   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;

wifi/1.0/types.hal

diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index dd09820..8eb0c2f 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -823,6 +823,18 @@
    */
   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.
    */
   uint16_t rssiWindowSize;