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

Commit 62f444e4 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Use BT_OCTET8 in btm_ble_ltk_request 

Bug: 301661850
Test: m com.android.btservices
Flag: EXEMPT, no-op
Change-Id: Iae8dc1e8a066fdc023e95528b13bd3fd8e6380aa
parent ed2401a9

system/stack/btm/btm_ble_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ tBTM_STATUS btm_ble_set_encryption(const RawAddress& bd_addr, 
 * Returns          void

 *

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

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

void btm_ble_ltk_request(uint16_t handle, BT_OCTET8 rand, uint16_t ediv) {

  tBTM_SEC_CB* p_cb = &btm_sec_cb;

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);

system/test/mock/mock_stack_btm_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ void btm_ble_link_sec_check(const RawAddress& bd_addr, 
  test::mock::stack_btm_ble::btm_ble_link_sec_check(bd_addr, auth_req,

                                                    p_sec_req_act);

}

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

void btm_ble_ltk_request(uint16_t handle, BT_OCTET8 rand, uint16_t ediv) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::btm_ble_ltk_request(handle, rand, ediv);

}

system/test/mock/mock_stack_btm_ble.h

+3 −3
Original line number Diff line number Diff line
@@ -478,9 +478,9 @@ extern struct btm_ble_link_sec_check btm_ble_link_sec_check; 
// Params: uint16_t handle, uint8_t rand[8], uint16_t ediv

// Return: void

struct btm_ble_ltk_request {

  std::function<void(uint16_t handle, uint8_t* rand, uint16_t ediv)> body{

      [](uint16_t /* handle */, uint8_t* /* rand */, uint16_t /* ediv */) {}};

  void operator()(uint16_t handle, uint8_t* rand, uint16_t ediv) {

  std::function<void(uint16_t handle, BT_OCTET8 rand, uint16_t ediv)> body{

      [](uint16_t /* handle */, BT_OCTET8 /* rand */, uint16_t /* ediv */) {}};

  void operator()(uint16_t handle, BT_OCTET8 rand, uint16_t ediv) {

    body(handle, rand, ediv);

  };

};