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

Commit d91b6a50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gd: Set scan response data based on AdvertisingType" am: c147b270 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1545233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2826efcd1d18266c9b00045faa8b146f90d7d172
parents ef888026 c147b270

system/gd/hci/le_advertising_manager.cc

+6 −4
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    switch (advertising_api_type_) {

      case (AdvertisingApiType::LEGACY): {

        set_parameters(id, config);

        if (!config.scan_response.empty()) {

        if (config.advertising_type == AdvertisingType::ADV_IND ||

            config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {

          set_data(id, true, config.scan_response);

        }

        set_data(id, false, config.advertisement);
@@ -233,7 +234,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        set_parameters(id, config);

        if (!config.scan_response.empty()) {

        if (config.advertising_type == AdvertisingType::ADV_IND ||

            config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {

          set_data(id, true, config.scan_response);

        }

        set_data(id, false, config.advertisement);
@@ -291,8 +293,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      advertising_sets_[id].current_address =

          AddressWithType(controller_->GetMacAddress(), AddressType::PUBLIC_DEVICE_ADDRESS);

    }



    if (!config.scan_response.empty()) {

    if (config.advertising_type == AdvertisingType::ADV_IND ||

        config.advertising_type == AdvertisingType::ADV_NONCONN_IND) {

      set_data(id, true, config.scan_response);

    }

    set_data(id, false, config.advertisement);