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

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

Remove btsnd_hcic_ble_clear_acceptlist 

Bug: 261272012
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Iafdd0491ebd53029754e2c0f6662c7c086d07139
parent e13760ce

system/stack/hcic/hciblecmds.cc

+0 −6
Original line number Diff line number Diff line
@@ -324,12 +324,6 @@ void btsnd_hcic_ble_create_conn_cancel(void) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_ble_clear_acceptlist(

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_CLEAR_ACCEPTLIST, nullptr, 0,

                            std::move(cb));

}



void btsnd_hcic_ble_add_acceptlist(

    uint8_t addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

system/stack/include/hcimsgs.h

+0 −3
Original line number Diff line number Diff line
@@ -404,9 +404,6 @@ extern void btsnd_hcic_ble_create_conn_cancel(void); 


extern void btsnd_hcic_ble_read_acceptlist_size(void);



extern void btsnd_hcic_ble_clear_acceptlist(

    base::OnceCallback<void(uint8_t*, uint16_t)> cb);



extern void btsnd_hcic_ble_add_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb);

system/test/mock/mock_stack_hcic_hciblecmds.cc

+0 −7
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct btsnd_hci_ble_remove_device_from_periodic_advertiser_list 
struct btsnd_hcic_accept_cis_req btsnd_hcic_accept_cis_req;

struct btsnd_hcic_big_term_sync btsnd_hcic_big_term_sync;

struct btsnd_hcic_ble_add_acceptlist btsnd_hcic_ble_add_acceptlist;

struct btsnd_hcic_ble_clear_acceptlist btsnd_hcic_ble_clear_acceptlist;

struct btsnd_hcic_ble_create_conn_cancel btsnd_hcic_ble_create_conn_cancel;

struct btsnd_hcic_ble_create_ll_conn btsnd_hcic_ble_create_ll_conn;

struct btsnd_hcic_ble_enh_rx_test btsnd_hcic_ble_enh_rx_test;
@@ -177,12 +176,6 @@ void btsnd_hcic_ble_add_acceptlist( 
  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_add_acceptlist(

      addr_type, bda, std::move(cb));

}

void btsnd_hcic_ble_clear_acceptlist(

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_clear_acceptlist(

      std::move(cb));

}

void btsnd_hcic_ble_create_conn_cancel(void) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_create_conn_cancel();

system/test/mock/mock_stack_hcic_hciblecmds.h

+0 −12
Original line number Diff line number Diff line
@@ -173,18 +173,6 @@ struct btsnd_hcic_ble_add_device_resolving_list { 
extern struct btsnd_hcic_ble_add_device_resolving_list

    btsnd_hcic_ble_add_device_resolving_list;



// Name: btsnd_hcic_ble_clear_acceptlist

// Params: base::OnceCallback<void(uint8_t*, uint16_t

// Return: void

struct btsnd_hcic_ble_clear_acceptlist {

  std::function<void(base::OnceCallback<void(uint8_t*, uint16_t)>)> body{

      [](base::OnceCallback<void(uint8_t*, uint16_t)> cb) {}};

  void operator()(base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

    body(std::move(cb));

  };

};

extern struct btsnd_hcic_ble_clear_acceptlist btsnd_hcic_ble_clear_acceptlist;



// Name: btsnd_hcic_ble_clear_resolving_list

// Params: void

// Return: void