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

Commit 5b3176a0 authored by Rongxuan Liu's avatar Rongxuan Liu
Browse files

Unify the callback trigger in check_status_with_id 

Test: m Bluetooth
Test: atest bluetooth_test_gd_unit
Bug: 303546333
Change-Id: I721a66c901b8ee48074eeb710c56898117feb747
parent 7072fda7

system/gd/hci/le_advertising_manager.cc

+125 −72
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
            module_handler_->BindOnceOn(

                this,

                &impl::check_status_with_id<LeSetAdvertisingParametersCompleteView>,

                true,

                advertiser_id));

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {
@@ -796,7 +797,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
                config.filter_policy,

                advertiser_id,

                config.tx_power),

            module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

            module_handler_->BindOnceOn(

                this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, true, advertiser_id));

      } break;

      case (AdvertisingApiType::EXTENDED): {

        // sid must be in range 0x00 to 0x0F. Since no controller supports more than
@@ -978,23 +980,31 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          le_advertising_interface_->EnqueueCommand(

              hci::LeSetScanResponseDataBuilder::Create(data),

              module_handler_->BindOnceOn(

                  this, &impl::check_status_with_id<LeSetScanResponseDataCompleteView>, advertiser_id));

                  this,

                  &impl::check_status_with_id<LeSetScanResponseDataCompleteView>,

                  true,

                  advertiser_id));

        } else {

          le_advertising_interface_->EnqueueCommand(

              hci::LeSetAdvertisingDataBuilder::Create(data),

              module_handler_->BindOnceOn(

                  this, &impl::check_status_with_id<LeSetAdvertisingDataCompleteView>, advertiser_id));

                  this,

                  &impl::check_status_with_id<LeSetAdvertisingDataCompleteView>,

                  true,

                  advertiser_id));

        }

      } break;

      case (AdvertisingApiType::ANDROID_HCI): {

        if (set_scan_rsp) {

          le_advertising_interface_->EnqueueCommand(

              hci::LeMultiAdvtSetScanRespBuilder::Create(data, advertiser_id),

              module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

              module_handler_->BindOnceOn(

                  this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, true, advertiser_id));

        } else {

          le_advertising_interface_->EnqueueCommand(

              hci::LeMultiAdvtSetDataBuilder::Create(data, advertiser_id),

              module_handler_->BindOnceOn(this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, advertiser_id));

              module_handler_->BindOnceOn(

                  this, &impl::check_status_with_id<LeMultiAdvtCompleteView>, true, advertiser_id));

        }

      } break;

      case (AdvertisingApiType::EXTENDED): {
@@ -1080,17 +1090,49 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 


  void send_data_fragment(

      AdvertiserId advertiser_id, bool set_scan_rsp, std::vector<GapData> data, Operation operation) {

    if (IS_FLAG_ENABLED(divide_long_single_gap_data)) {

      // For first and intermediate fragment, do not trigger advertising_callbacks_.

      bool send_callback =

          (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT);

      if (set_scan_rsp) {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedScanResponseDataBuilder::Create(

                advertiser_id, operation, kFragment_preference, data),

            module_handler_->BindOnceOn(

                this,

                &impl::check_status_with_id<LeSetExtendedScanResponseDataCompleteView>,

                send_callback,

                advertiser_id));

      } else {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedAdvertisingDataBuilder::Create(

                advertiser_id, operation, kFragment_preference, data),

            module_handler_->BindOnceOn(

                this,

                &impl::check_status_with_id<LeSetExtendedAdvertisingDataCompleteView>,

                send_callback,

                advertiser_id));

      }

    } else {

      if (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT) {

        if (set_scan_rsp) {

          le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedScanResponseDataBuilder::Create(advertiser_id, operation, kFragment_preference, data),

              hci::LeSetExtendedScanResponseDataBuilder::Create(

                  advertiser_id, operation, kFragment_preference, data),

              module_handler_->BindOnceOn(

                this, &impl::check_status_with_id<LeSetExtendedScanResponseDataCompleteView>, advertiser_id));

                  this,

                  &impl::check_status_with_id<LeSetExtendedScanResponseDataCompleteView>,

                  true,

                  advertiser_id));

        } else {

          le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedAdvertisingDataBuilder::Create(advertiser_id, operation, kFragment_preference, data),

              hci::LeSetExtendedAdvertisingDataBuilder::Create(

                  advertiser_id, operation, kFragment_preference, data),

              module_handler_->BindOnceOn(

                this, &impl::check_status_with_id<LeSetExtendedAdvertisingDataCompleteView>, advertiser_id));

                  this,

                  &impl::check_status_with_id<LeSetExtendedAdvertisingDataCompleteView>,

                  true,

                  advertiser_id));

        }

      } else {

        // For first and intermediate fragment, do not trigger advertising_callbacks_.
@@ -1107,13 +1149,16 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        }

      }

    }

  }



  void send_data_fragment_with_raw_builder(

      AdvertiserId advertiser_id,

      bool set_scan_rsp,

      std::unique_ptr<packet::RawBuilder> data,

      Operation operation) {

    if (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT) {

    // For first and intermediate fragment, do not trigger advertising_callbacks_.

    bool send_callback =

        (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT);

    if (set_scan_rsp) {

      le_advertising_interface_->EnqueueCommand(

          hci::LeSetExtendedScanResponseDataRawBuilder::Create(
@@ -1121,6 +1166,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          module_handler_->BindOnceOn(

              this,

              &impl::check_status_with_id<LeSetExtendedScanResponseDataCompleteView>,

              send_callback,

              advertiser_id));

    } else {

      le_advertising_interface_->EnqueueCommand(
@@ -1129,22 +1175,9 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          module_handler_->BindOnceOn(

              this,

              &impl::check_status_with_id<LeSetExtendedAdvertisingDataCompleteView>,

              send_callback,

              advertiser_id));

    }

    } else {

      // For first and intermediate fragment, do not trigger advertising_callbacks_.

      if (set_scan_rsp) {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedScanResponseDataRawBuilder::Create(

                advertiser_id, operation, kFragment_preference, std::move(data)),

            module_handler_->BindOnce(check_complete<LeSetExtendedScanResponseDataCompleteView>));

      } else {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetExtendedAdvertisingDataRawBuilder::Create(

                advertiser_id, operation, kFragment_preference, std::move(data)),

            module_handler_->BindOnce(check_complete<LeSetExtendedAdvertisingDataCompleteView>));

      }

    }

  }



  void enable_advertiser(
@@ -1222,6 +1255,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        module_handler_->BindOnceOn(

            this,

            &impl::check_status_with_id<LeSetPeriodicAdvertisingParametersCompleteView>,

            true,

            advertiser_id));

  }
@@ -1294,11 +1328,26 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
  }



  void send_periodic_data_fragment(AdvertiserId advertiser_id, std::vector<GapData> data, Operation operation) {

    if (IS_FLAG_ENABLED(divide_long_single_gap_data)) {

      // For first and intermediate fragment, do not trigger advertising_callbacks_.

      bool send_callback =

          (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT);

      le_advertising_interface_->EnqueueCommand(

          hci::LeSetPeriodicAdvertisingDataBuilder::Create(advertiser_id, operation, data),

          module_handler_->BindOnceOn(

              this,

              &impl::check_status_with_id<LeSetPeriodicAdvertisingDataCompleteView>,

              send_callback,

              advertiser_id));

    } else {

      if (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT) {

        le_advertising_interface_->EnqueueCommand(

            hci::LeSetPeriodicAdvertisingDataBuilder::Create(advertiser_id, operation, data),

            module_handler_->BindOnceOn(

              this, &impl::check_status_with_id<LeSetPeriodicAdvertisingDataCompleteView>, advertiser_id));

                this,

                &impl::check_status_with_id<LeSetPeriodicAdvertisingDataCompleteView>,

                true,

                advertiser_id));

      } else {

        // For first and intermediate fragment, do not trigger advertising_callbacks_.

        le_advertising_interface_->EnqueueCommand(
@@ -1306,24 +1355,21 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
            module_handler_->BindOnce(check_complete<LeSetPeriodicAdvertisingDataCompleteView>));

      }

    }

  }



  void send_periodic_data_fragment_with_raw_builder(

      AdvertiserId advertiser_id, std::unique_ptr<packet::RawBuilder> data, Operation operation) {

    if (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT) {

    // For first and intermediate fragment, do not trigger advertising_callbacks_.

    bool send_callback =

        (operation == Operation::COMPLETE_ADVERTISEMENT || operation == Operation::LAST_FRAGMENT);

    le_advertising_interface_->EnqueueCommand(

        hci::LeSetPeriodicAdvertisingDataRawBuilder::Create(

            advertiser_id, operation, std::move(data)),

        module_handler_->BindOnceOn(

            this,

            &impl::check_status_with_id<LeSetPeriodicAdvertisingDataCompleteView>,

            send_callback,

            advertiser_id));

    } else {

      // For first and intermediate fragment, do not trigger advertising_callbacks_.

      le_advertising_interface_->EnqueueCommand(

          hci::LeSetPeriodicAdvertisingDataRawBuilder::Create(

              advertiser_id, operation, std::move(data)),

          module_handler_->BindOnce(check_complete<LeSetPeriodicAdvertisingDataCompleteView>));

    }

  }



  void enable_periodic_advertising(AdvertiserId advertiser_id, bool enable, bool include_adi) {
@@ -1660,7 +1706,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
  }



  template <class View>

  void check_status_with_id(AdvertiserId id, CommandCompleteView view) {

  void check_status_with_id(bool send_callback, AdvertiserId id, CommandCompleteView view) {

    ASSERT(view.IsValid());

    auto status_view = View::Create(view);

    ASSERT(status_view.IsValid());
@@ -1682,6 +1728,13 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      return;

    }



    if (IS_FLAG_ENABLED(divide_long_single_gap_data)) {

      // Do not trigger callback if send_callback is false

      if (!send_callback) {

        return;

      }

    }



    OpCode opcode = view.GetCommandOpCode();



    switch (opcode) {