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

Commit eb292ef5 authored by Chris Manton's avatar Chris Manton
Browse files

::BleAdvertiserInterface: Reduce ambiguity using explicit namespace 

Bug: 351027753
Test: m .
Flag: EXEMPT, Explicit namespace assignment

Change-Id: Ifdec35c5e11e564219d0c4638f8d78040c8bdd17
parent 40a69f2b

system/bta/le_audio/broadcaster/state_machine.cc

+4 −4
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public: 
  }



  static IBroadcastStateMachineCallbacks* callbacks_;

  static BleAdvertiserInterface* advertiser_if_;

  static ::BleAdvertiserInterface* advertiser_if_;



private:

  std::optional<BigConfig> active_config_;
@@ -326,8 +326,8 @@ private: 
    log::info("is_public={}, broadcast_name={}, public_features={}",

              is_public ? "public" : "non-public", broadcast_name, public_announcement.features);

    if (advertiser_if_ != nullptr) {

      AdvertiseParameters adv_params;

      PeriodicAdvertisingParameters periodic_params;

      ::AdvertiseParameters adv_params;

      ::PeriodicAdvertisingParameters periodic_params;

      std::vector<uint8_t> adv_data;

      std::vector<uint8_t> periodic_data;
@@ -569,7 +569,7 @@ private: 
};



IBroadcastStateMachineCallbacks* BroadcastStateMachineImpl::callbacks_ = nullptr;

BleAdvertiserInterface* BroadcastStateMachineImpl::advertiser_if_ = nullptr;

::BleAdvertiserInterface* BroadcastStateMachineImpl::advertiser_if_ = nullptr;

} /* namespace */



std::unique_ptr<BroadcastStateMachine> BroadcastStateMachine::CreateInstance(

system/bta/le_audio/broadcaster/state_machine_test.cc

+19 −19
Original line number Diff line number Diff line
@@ -118,13 +118,13 @@ protected: 


    ON_CALL(*mock_ble_advertising_manager_, StartAdvertisingSet)

            .WillByDefault([this](uint8_t client_id, int reg_id,

                                  BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                                  AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                                  ::BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                                  ::AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                                  std::vector<uint8_t> scan_response_data,

                                  PeriodicAdvertisingParameters periodic_params,

                                  ::PeriodicAdvertisingParameters periodic_params,

                                  std::vector<uint8_t> periodic_data, uint16_t duration,

                                  uint8_t maxExtAdvEvents,

                                  BleAdvertiserInterface::IdStatusCallback timeout_cb) {

                                  ::BleAdvertiserInterface::IdStatusCallback timeout_cb) {

              static uint8_t advertiser_id = 1;

              uint8_t tx_power = 32;

              uint8_t status = 0;
@@ -135,15 +135,15 @@ protected: 


    ON_CALL(*mock_ble_advertising_manager_, Enable)

            .WillByDefault([this](uint8_t advertiser_id, bool enable,

                                  BleAdvertiserInterface::StatusCallback cb, uint16_t duration,

                                  ::BleAdvertiserInterface::StatusCallback cb, uint16_t duration,

                                  uint8_t maxExtAdvEvents,

                                  BleAdvertiserInterface::StatusCallback timeout_cb) {

                                  ::BleAdvertiserInterface::StatusCallback timeout_cb) {

              uint8_t status = 0;

              this->adv_callbacks_->OnAdvertisingEnabled(advertiser_id, enable, status);

            });



    ON_CALL(*mock_ble_advertising_manager_, GetOwnAddress)

            .WillByDefault([](uint8_t inst_id, BleAdvertiserInterface::GetAddressCallback cb) {

            .WillByDefault([](uint8_t inst_id, ::BleAdvertiserInterface::GetAddressCallback cb) {

              uint8_t address_type = 0x02;

              RawAddress address;

              const uint8_t addr[] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
@@ -153,14 +153,14 @@ protected: 


    ON_CALL(*mock_ble_advertising_manager_, SetData)

            .WillByDefault([this](int advertiser_id, bool set_scan_rsp, std::vector<uint8_t> data,

                                  BleAdvertiserInterface::StatusCallback cb) {

                                  ::BleAdvertiserInterface::StatusCallback cb) {

              uint8_t status = 0;

              this->adv_callbacks_->OnAdvertisingDataSet(advertiser_id, status);

            });



    ON_CALL(*mock_ble_advertising_manager_, SetPeriodicAdvertisingData)

            .WillByDefault([this](int advertiser_id, std::vector<uint8_t> data,

                                  BleAdvertiserInterface::StatusCallback cb) {

                                  ::BleAdvertiserInterface::StatusCallback cb) {

              uint8_t status = 0;

              this->adv_callbacks_->OnPeriodicAdvertisingDataSet(advertiser_id, status);

            });
@@ -362,13 +362,13 @@ protected: 
TEST_F(StateMachineTest, CreateInstanceFailed) {

  EXPECT_CALL(*mock_ble_advertising_manager_, StartAdvertisingSet)

          .WillOnce([this](uint8_t client_id, int reg_id,

                           BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                           AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                           ::BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                           ::AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                           std::vector<uint8_t> scan_response_data,

                           PeriodicAdvertisingParameters periodic_params,

                           ::PeriodicAdvertisingParameters periodic_params,

                           std::vector<uint8_t> periodic_data, uint16_t duration,

                           uint8_t maxExtAdvEvents,

                           BleAdvertiserInterface::IdStatusCallback timeout_cb) {

                           ::BleAdvertiserInterface::IdStatusCallback timeout_cb) {

            uint8_t advertiser_id = 1;

            uint8_t tx_power = 0;

            uint8_t status = 1;
@@ -924,20 +924,20 @@ TEST_F(StateMachineTest, GetPublicBroadcastAnnouncement) { 
}



TEST_F(StateMachineTest, AnnouncementTest) {

  AdvertiseParameters adv_params;

  ::AdvertiseParameters adv_params;

  std::vector<uint8_t> a_data;

  std::vector<uint8_t> p_data;



  EXPECT_CALL(*mock_ble_advertising_manager_, StartAdvertisingSet)

          .WillOnce([this, &p_data, &a_data, &adv_params](

                            uint8_t client_id, int reg_id,

                            BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                            AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                            ::BleAdvertiserInterface::IdTxPowerStatusCallback register_cb,

                            ::AdvertiseParameters params, std::vector<uint8_t> advertise_data,

                            std::vector<uint8_t> scan_response_data,

                            PeriodicAdvertisingParameters periodic_params,

                            ::PeriodicAdvertisingParameters periodic_params,

                            std::vector<uint8_t> periodic_data, uint16_t duration,

                            uint8_t maxExtAdvEvents,

                            BleAdvertiserInterface::IdStatusCallback timeout_cb) {

                            ::BleAdvertiserInterface::IdStatusCallback timeout_cb) {

            uint8_t advertiser_id = 1;

            uint8_t tx_power = 0;

            uint8_t status = 0;
@@ -985,7 +985,7 @@ TEST_F(StateMachineTest, AnnouncementTest) { 
TEST_F(StateMachineTest, GetMetadataBeforeGettingAddress) {

  unsigned int broadcast_id = 0;



  BleAdvertiserInterface::GetAddressCallback cb;

  ::BleAdvertiserInterface::GetAddressCallback cb;



  /* Address should be already known after notifying callback recipients */

  EXPECT_CALL(*(sm_callbacks_.get()),

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -3104,7 +3104,7 @@ static void id_status_callback(tBT_TRANSPORT transport, bool is_valid, const Oct 
  log::info("oob_advertiser_id: {}", id);



  auto advertiser = bluetooth::shim::get_ble_advertiser_instance();

  AdvertiseParameters parameters{};

  ::AdvertiseParameters parameters{};

  parameters.advertising_event_properties = 0x0045 /* connectable, discoverable, tx power */;

  parameters.min_interval = 0xa0;   // 100 ms

  parameters.max_interval = 0x500;  // 800 ms

system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.h

+8 −8
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ namespace rust { 
//

// This shim implementation just calls the underlying interface and binds the

// local callbacks in order to dispatch the Rust callbacks.

class BleAdvertiserIntf : public AdvertisingCallbacks {

class BleAdvertiserIntf : public ::AdvertisingCallbacks {

public:

  BleAdvertiserIntf(BleAdvertiserInterface* adv_intf) : adv_intf_(adv_intf) {}

  BleAdvertiserIntf(::BleAdvertiserInterface* adv_intf) : adv_intf_(adv_intf) {}

  ~BleAdvertiserIntf() = default;



  // AdvertisingCallbacks overrides
@@ -53,19 +53,19 @@ public: 
  void Unregister(uint8_t adv_id);



  void GetOwnAddress(uint8_t adv_id);

  void SetParameters(uint8_t adv_id, AdvertiseParameters params);

  void SetParameters(uint8_t adv_id, ::AdvertiseParameters params);

  void SetData(uint8_t adv_id, bool set_scan_rsp, ::rust::Vec<uint8_t> data);

  void Enable(uint8_t adv_id, bool enable, uint16_t duration, uint8_t max_ext_adv_events);

  void StartAdvertising(uint8_t adv_id, AdvertiseParameters params,

  void StartAdvertising(uint8_t adv_id, ::AdvertiseParameters params,

                        ::rust::Vec<uint8_t> advertise_data,

                        ::rust::Vec<uint8_t> scan_response_data, int32_t timeout_in_sec);

  void StartAdvertisingSet(int32_t reg_id, AdvertiseParameters params,

  void StartAdvertisingSet(int32_t reg_id, ::AdvertiseParameters params,

                           ::rust::Vec<uint8_t> advertise_data,

                           ::rust::Vec<uint8_t> scan_response_data,

                           PeriodicAdvertisingParameters periodic_params,

                           ::PeriodicAdvertisingParameters periodic_params,

                           ::rust::Vec<uint8_t> periodic_data, uint16_t duration,

                           uint8_t max_ext_adv_events);

  void SetPeriodicAdvertisingParameters(uint8_t adv_id, PeriodicAdvertisingParameters params);

  void SetPeriodicAdvertisingParameters(uint8_t adv_id, ::PeriodicAdvertisingParameters params);

  void SetPeriodicAdvertisingData(uint8_t adv_id, ::rust::Vec<uint8_t> data);

  void SetPeriodicAdvertisingEnable(uint8_t adv_id, bool enable, bool include_adi);
@@ -79,7 +79,7 @@ private: 
  void OnParametersCallback(uint8_t adv_id, uint8_t status, int8_t tx_power);

  void OnGetAddressCallback(uint8_t adv_id, uint8_t addr_type, RawAddress address);



  BleAdvertiserInterface* adv_intf_;

  ::BleAdvertiserInterface* adv_intf_;

};



std::unique_ptr<BleAdvertiserIntf> GetBleAdvertiserIntf(const unsigned char* gatt_intf);

system/main/shim/le_advertising_manager.cc

+90 −57

File changed.

Preview size limit exceeded, changes collapsed.