Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31d30d3c authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[AWARE] Configure the subscribe information in beacons"

parents 6081e265 b0557b47

wifi/1.0/default/hidl_struct_util.cpp

+16 −2
Original line number Diff line number Diff line
@@ -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;