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

Commit 00dfb625 authored by Myles Watson's avatar Myles Watson
Browse files

Remove unused btm_le_on_advertising_set_terminated 

This event is handled in LeAdvertisingManager, and there
are no observers registered, so it would be a no-op either
way.

Bug: 301661850
Test: mma -j32
Flag: EXEMPT, dead code removal
Change-Id: Ie74f69075928561c39d8729440c43c7bec5251d9
parent 42cf9beb

system/stack/btm/ble_advertiser_hci_interface.cc

+0 −7
Original line number Diff line number Diff line
@@ -752,13 +752,6 @@ class BleAdvertiserHciExtendedImpl : public BleAdvertiserHciInterface { 


}  // namespace



void btm_le_on_advertising_set_terminated(uint8_t* p, uint16_t length) {

  if (BleAdvertiserHciInterface::Get()) {

    ((BleAdvertiserHciExtendedImpl*)BleAdvertiserHciInterface::Get())

        ->OnAdvertisingSetTerminated(length, p);

  }

}



bool legacy_advertising_in_use = false;

void btm_ble_advertiser_notify_terminated_legacy(uint8_t status,

                                                 uint16_t connection_handle) {

system/stack/btu/btu_hcif.cc

+0 −4
Original line number Diff line number Diff line
@@ -359,10 +359,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
          btm_ble_process_ext_adv_pkt(hci_evt_len, p);

          break;



        case HCI_LE_ADVERTISING_SET_TERMINATED_EVT:

          btm_le_on_advertising_set_terminated(p, hci_evt_len);

          break;



        case HCI_BLE_REQ_PEER_SCA_CPL_EVT:

          btm_acl_process_sca_cmpl_pkt(ble_evt_len, p);

          break;

system/stack/include/ble_hci_link_interface.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ void btm_ble_process_adv_pkt(uint8_t len, const uint8_t* p); 
void btm_ble_process_ext_adv_pkt(uint8_t len, const uint8_t* p);

void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* p);

void btm_ble_read_remote_features_complete(uint8_t* p, uint8_t length);

void btm_le_on_advertising_set_terminated(uint8_t* p, uint16_t length);

void btm_ble_write_adv_enable_complete(uint8_t* p, uint16_t evt_len);

void btm_ble_create_ll_conn_complete(tHCI_STATUS status);

void btm_ble_ltk_request(uint16_t handle, uint8_t rand[8], uint16_t ediv);

system/test/mock/mock_stack_btm_ble_advertiser_hci_interface.cc

+0 −7
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ namespace mock { 
namespace stack_btm_ble_advertiser_hci_interface {



// Function state capture and return values, if needed

struct btm_le_on_advertising_set_terminated

    btm_le_on_advertising_set_terminated;

struct btm_ble_advertiser_notify_terminated_legacy

    btm_ble_advertiser_notify_terminated_legacy;
@@ -47,11 +45,6 @@ struct btm_ble_advertiser_notify_terminated_legacy 
}  // namespace test



// Mocked functions, if any

void btm_le_on_advertising_set_terminated(uint8_t* p, uint16_t length) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble_advertiser_hci_interface::

      btm_le_on_advertising_set_terminated(p, length);

}

void btm_ble_advertiser_notify_terminated_legacy(uint8_t status,

                                                 uint16_t connection_handle) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_btm_ble_advertiser_hci_interface.h

+0 −10
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ namespace mock { 
namespace stack_btm_ble_advertiser_hci_interface {



// Shared state between mocked functions and tests

// Name: btm_le_on_advertising_set_terminated

// Params: uint8_t* p, uint16_t length

// Returns: void

struct btm_le_on_advertising_set_terminated {

  std::function<void(uint8_t* p, uint16_t length)> body{

      [](uint8_t* /* p */, uint16_t /* length */) {}};

  void operator()(uint8_t* p, uint16_t length) { body(p, length); };

};

extern struct btm_le_on_advertising_set_terminated

    btm_le_on_advertising_set_terminated;

// Name: btm_ble_advertiser_notify_terminated_legacy

// Params: uint8_t status, uint16_t connection_handle

// Returns: void