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

Commit c5fb4c17 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Const-ify btm_ble_ am: 9cbe353a am: 582f7408 am: c499dba6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1913038

Change-Id: Iba90416b0082d193ae716ac41eededaaa48b33d0
parents 358048ee c499dba6

system/stack/btm/btm_ble_privacy.cc

+2 −1
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ void btm_ble_remove_resolving_list_entry_complete(uint8_t* p, 
 * Returns          void

 *

 ******************************************************************************/

void btm_ble_read_resolving_list_entry_complete(uint8_t* p, uint16_t evt_len) {

void btm_ble_read_resolving_list_entry_complete(const uint8_t* p,

                                                uint16_t evt_len) {

  uint8_t status;

  RawAddress rra, pseudo_bda;

system/stack/include/ble_hci_link_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr, 
                                               bool refresh);

extern bool btm_identity_addr_to_random_pseudo_from_address_with_type(

    tBLE_BD_ADDR* address_with_type, bool refresh);

extern void btm_ble_read_resolving_list_entry_complete(uint8_t* p,

extern void btm_ble_read_resolving_list_entry_complete(const uint8_t* p,

                                                       uint16_t evt_len);

extern void btm_ble_create_conn_cancel_complete(uint8_t* p);

extern void btm_ble_remove_resolving_list_entry_complete(uint8_t* p,

system/test/mock/mock_stack_btm_ble_privacy.cc

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ void btm_ble_remove_resolving_list_entry_complete(uint8_t* p, 
  test::mock::stack_btm_ble_privacy::

      btm_ble_remove_resolving_list_entry_complete(p, evt_len);

}

void btm_ble_read_resolving_list_entry_complete(uint8_t* p, uint16_t evt_len) {

void btm_ble_read_resolving_list_entry_complete(const uint8_t* p,

                                                uint16_t evt_len) {

  mock_function_count_map[__func__]++;

  test::mock::stack_btm_ble_privacy::btm_ble_read_resolving_list_entry_complete(

      p, evt_len);

system/test/mock/mock_stack_btm_ble_privacy.h

+3 −3
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ extern struct btm_ble_remove_resolving_list_entry_complete 
// Params: uint8_t* p, uint16_t evt_len

// Returns: void

struct btm_ble_read_resolving_list_entry_complete {

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

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

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

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

      [](const uint8_t* p, uint16_t evt_len) {}};

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

};

extern struct btm_ble_read_resolving_list_entry_complete

    btm_ble_read_resolving_list_entry_complete;