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

Commit 77b97211 authored by Chienyuan's avatar Chienyuan Committed by Automerger Merge Worker
Browse files

gd: Handle duration and max advertising event am: 33fed082 am: 823f0eba am: 7ed93c89 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4763c13b81a9d90610d9aba061881c039b9c70ae
parents 0f0b305f 7ed93c89

system/gd/hci/facade/le_advertising_manager_facade.cc

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ class LeAdvertisingManagerFacadeService : public LeAdvertisingManagerFacade::Ser 
        config,

        common::Bind(&LeAdvertiser::ScanCallback, common::Unretained(&le_advertiser)),

        common::Bind(&LeAdvertiser::TerminatedCallback, common::Unretained(&le_advertiser)),

        0,

        0,

        facade_handler_);

    if (advertiser_id != LeAdvertisingManager::kInvalidId) {

      le_advertiser.SetAdvertiserId(advertiser_id);

system/gd/hci/le_advertising_manager.cc

+16 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct Advertiser { 
  common::Callback<void(Address, AddressType)> scan_callback;

  common::Callback<void(ErrorCode, uint8_t, uint8_t)> set_terminated_callback;

  int8_t tx_power;

  uint16_t duration;

  bool started = false;

};
@@ -249,6 +250,8 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
      const ExtendedAdvertisingConfig config,

      const common::Callback<void(Address, AddressType)>& scan_callback,

      const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

      uint16_t duration,

      uint8_t max_ext_adv_events,

      os::Handler* handler) {

    id_map_[id] = reg_id;
@@ -259,6 +262,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 


    advertising_sets_[id].scan_callback = scan_callback;

    advertising_sets_[id].set_terminated_callback = set_terminated_callback;

    advertising_sets_[id].duration = duration;

    advertising_sets_[id].handler = handler;



    if (!address_manager_registered) {
@@ -291,12 +295,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    }



    if (!paused) {

      enable_advertiser(id, true, 0, 0);

      enable_advertiser(id, true, duration, max_ext_adv_events);

    } else {

      EnabledSet curr_set;

      curr_set.advertising_handle_ = id;

      curr_set.duration_ = 0;                         // TODO: 0 means until the host disables it

      curr_set.max_extended_advertising_events_ = 0;  // TODO: 0 is no maximum

      curr_set.duration_ = duration;

      curr_set.max_extended_advertising_events_ = max_ext_adv_events;

      std::vector<EnabledSet> enabled_sets = {curr_set};

      enabled_sets_[id] = curr_set;

    }
@@ -561,11 +565,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
    }

  }



  void enable_advertiser(AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t maxExtAdvEvents) {

  void enable_advertiser(

      AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t max_extended_advertising_events) {

    EnabledSet curr_set;

    curr_set.advertising_handle_ = advertiser_id;

    curr_set.duration_ = duration;

    curr_set.max_extended_advertising_events_ = maxExtAdvEvents;

    curr_set.max_extended_advertising_events_ = max_extended_advertising_events;

    std::vector<EnabledSet> enabled_sets = {curr_set};

    Enable enable_value = enable ? Enable::ENABLED : Enable::DISABLED;
@@ -1054,6 +1059,8 @@ AdvertiserId LeAdvertisingManager::ExtendedCreateAdvertiser( 
    const ExtendedAdvertisingConfig config,

    const common::Callback<void(Address, AddressType)>& scan_callback,

    const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

    uint16_t duration,

    uint8_t max_extended_advertising_events,

    os::Handler* handler) {

  AdvertisingApiType advertising_api_type = pimpl_->get_advertising_api_type();

  if (advertising_api_type != AdvertisingApiType::EXTENDED) {
@@ -1096,6 +1103,8 @@ AdvertiserId LeAdvertisingManager::ExtendedCreateAdvertiser( 
      config,

      scan_callback,

      set_terminated_callback,

      duration,

      max_extended_advertising_events,

      handler);

  return id;

}
@@ -1109,8 +1118,8 @@ void LeAdvertisingManager::SetData(AdvertiserId advertiser_id, bool set_scan_rsp 
}



void LeAdvertisingManager::EnableAdvertiser(

    AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t maxExtAdvEvents) {

  CallOn(pimpl_.get(), &impl::enable_advertiser, advertiser_id, enable, duration, maxExtAdvEvents);

    AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t max_extended_advertising_events) {

  CallOn(pimpl_.get(), &impl::enable_advertiser, advertiser_id, enable, duration, max_extended_advertising_events);

}



void LeAdvertisingManager::SetPeriodicParameters(

system/gd/hci/le_advertising_manager.h

+4 −1
Original line number Diff line number Diff line
@@ -109,13 +109,16 @@ class LeAdvertisingManager : public bluetooth::Module { 
      const ExtendedAdvertisingConfig config,

      const common::Callback<void(Address, AddressType)>& scan_callback,

      const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

      uint16_t duration,

      uint8_t max_extended_advertising_events,

      os::Handler* handler);



  void SetParameters(AdvertiserId advertiser_id, ExtendedAdvertisingConfig config);



  void SetData(AdvertiserId advertiser_id, bool set_scan_rsp, std::vector<GapData> data);



  void EnableAdvertiser(AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t maxExtAdvEvents);

  void EnableAdvertiser(

      AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t max_extended_advertising_events);



  void SetPeriodicParameters(AdvertiserId advertiser_id, PeriodicAdvertisingParameters periodic_advertising_parameters);

system/gd/hci/le_advertising_manager_mock.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ class MockLeAdvertisingManager : public LeAdvertisingManager { 
       const ExtendedAdvertisingConfig,

       const common::Callback<void(Address, AddressType)>&,

       const common::Callback<void(ErrorCode, uint8_t, uint8_t)>&,

       uint16_t,

       uint8_t,

       os::Handler*));

  MOCK_METHOD(void, RemoveAdvertiser, (AdvertiserId));

  MOCK_METHOD(

system/gd/hci/le_advertising_manager_test.cc

+6 −6
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ class LeAdvertisingAPITest : public LeAdvertisingManagerTest { 


    test_hci_layer_->SetCommandFuture();

    advertiser_id_ = le_advertising_manager_->ExtendedCreateAdvertiser(

        0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

        0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

    ASSERT_NE(LeAdvertisingManager::kInvalidId, advertiser_id_);

    EXPECT_CALL(

        mock_advertising_callback_,
@@ -458,7 +458,7 @@ class LeAndroidHciAdvertisingAPITest : public LeAndroidHciAdvertisingManagerTest 


    test_hci_layer_->SetSubCommandFuture(SubOcf::SET_PARAM);

    advertiser_id_ = le_advertising_manager_->ExtendedCreateAdvertiser(

        0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

        0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

    ASSERT_NE(LeAdvertisingManager::kInvalidId, advertiser_id_);

    std::vector<SubOcf> sub_ocf = {

        SubOcf::SET_PARAM,
@@ -518,7 +518,7 @@ class LeExtendedAdvertisingAPITest : public LeExtendedAdvertisingManagerTest { 


    test_hci_layer_->SetCommandFuture();

    advertiser_id_ = le_advertising_manager_->ExtendedCreateAdvertiser(

        0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

        0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

    ASSERT_NE(LeAdvertisingManager::kInvalidId, advertiser_id_);

    EXPECT_CALL(

        mock_advertising_callback_,
@@ -573,7 +573,7 @@ TEST_F(LeAdvertisingManagerTest, create_advertiser_test) { 


  test_hci_layer_->SetCommandFuture();

  auto id = le_advertising_manager_->ExtendedCreateAdvertiser(

      0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

      0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

  ASSERT_NE(LeAdvertisingManager::kInvalidId, id);

  std::vector<OpCode> adv_opcodes = {

      OpCode::LE_READ_ADVERTISING_PHYSICAL_CHANNEL_TX_POWER,
@@ -624,7 +624,7 @@ TEST_F(LeAndroidHciAdvertisingManagerTest, create_advertiser_test) { 


  test_hci_layer_->SetSubCommandFuture(SubOcf::SET_PARAM);

  auto id = le_advertising_manager_->ExtendedCreateAdvertiser(

      0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

      0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

  ASSERT_NE(LeAdvertisingManager::kInvalidId, id);

  std::vector<SubOcf> sub_ocf = {

      SubOcf::SET_PARAM, SubOcf::SET_DATA, SubOcf::SET_SCAN_RESP, SubOcf::SET_RANDOM_ADDR, SubOcf::SET_ENABLE,
@@ -669,7 +669,7 @@ TEST_F(LeExtendedAdvertisingManagerTest, create_advertiser_test) { 


  test_hci_layer_->SetCommandFuture();

  auto id = le_advertising_manager_->ExtendedCreateAdvertiser(

      0x00, advertising_config, scan_callback, set_terminated_callback, client_handler_);

      0x00, advertising_config, scan_callback, set_terminated_callback, 0, 0, client_handler_);

  ASSERT_NE(LeAdvertisingManager::kInvalidId, id);

  EXPECT_CALL(

      mock_advertising_callback_,