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

Commit d3b6f76a authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] make a few functions static in btm_ble_sec.cc" into main

parents 90d0eb5b dee730fc

system/stack/btm/btm_ble_sec.cc

+8 −8
Original line number Diff line number Diff line
@@ -641,9 +641,8 @@ tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, 
 * Returns          The appropriate security action required.

 *

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

tBTM_SEC_ACTION btm_ble_determine_security_act(bool is_originator,

                                               const RawAddress& bdaddr,

                                               uint16_t security_required) {

static tBTM_SEC_ACTION btm_ble_determine_security_act(

    bool is_originator, const RawAddress& bdaddr, uint16_t security_required) {

  tBTM_LE_AUTH_REQ auth_req = 0x00;



  if (is_originator) {
@@ -800,7 +799,8 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
 * Returns         None

 *

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

void btm_ble_increment_sign_ctr(const RawAddress& bd_addr, bool is_local) {

static void btm_ble_increment_sign_ctr(const RawAddress& bd_addr,

                                       bool is_local) {

  tBTM_SEC_DEV_REC* p_dev_rec;



  LOG_VERBOSE("btm_ble_increment_sign_ctr is_local=%d", is_local);
@@ -1410,7 +1410,7 @@ void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, 
 * Returns          void

 *

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

uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec,

static uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec,

                                           tBTM_LE_IO_REQ* p_data) {

  uint8_t callback_rc = BTM_SUCCESS;

  LOG_VERBOSE("p_dev_rec->bd_addr:%s",
@@ -1476,7 +1476,7 @@ uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, 
 * Returns          void

 *

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

uint8_t btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec,

static uint8_t btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec,

                                   tBTM_LE_IO_REQ* p_data) {

  uint8_t callback_rc = BTM_SUCCESS;

  LOG_VERBOSE("p_dev_rec->bd_addr:%s",

system/test/mock/mock_stack_btm_ble.cc

+0 −29
Original line number Diff line number Diff line
@@ -60,13 +60,9 @@ struct BTM_SecAddBleKey BTM_SecAddBleKey; 
struct BTM_SecurityGrant BTM_SecurityGrant;

struct BTM_SetBleDataLength BTM_SetBleDataLength;

struct BTM_UseLeLink BTM_UseLeLink;

struct btm_ble_br_keys_req btm_ble_br_keys_req;

struct btm_ble_connected btm_ble_connected;

struct btm_ble_determine_security_act btm_ble_determine_security_act;

struct btm_ble_get_acl_remote_addr btm_ble_get_acl_remote_addr;

struct btm_ble_get_enc_key_type btm_ble_get_enc_key_type;

struct btm_ble_increment_sign_ctr btm_ble_increment_sign_ctr;

struct btm_ble_io_capabilities_req btm_ble_io_capabilities_req;

struct btm_ble_link_encrypted btm_ble_link_encrypted;

struct btm_ble_link_sec_check btm_ble_link_sec_check;

struct btm_ble_ltk_request btm_ble_ltk_request;
@@ -113,11 +109,8 @@ const Octet16 BTM_GetDeviceIDRoot::return_value{ 
bool BTM_ReadConnectedTransportAddress::return_value = false;

tBTM_STATUS BTM_SetBleDataLength::return_value = 0;

bool BTM_UseLeLink::return_value = false;

uint8_t btm_ble_br_keys_req::return_value = 0;

tBTM_SEC_ACTION btm_ble_determine_security_act::return_value = 0;

bool btm_ble_get_acl_remote_addr::return_value = false;

bool btm_ble_get_enc_key_type::return_value = false;

uint8_t btm_ble_io_capabilities_req::return_value = 0;

uint8_t btm_ble_read_sec_key_size::return_value = 0;

tBTM_STATUS btm_ble_set_encryption::return_value = 0;

tBTM_STATUS btm_ble_start_encrypt::return_value = 0;
@@ -255,11 +248,6 @@ bool BTM_UseLeLink(const RawAddress& bd_addr) { 
  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble::BTM_UseLeLink(bd_addr);

}

uint8_t btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec,

                            tBTM_LE_IO_REQ* p_data) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble::btm_ble_br_keys_req(p_dev_rec, p_data);

}

void btm_ble_connected(const RawAddress& bda, uint16_t handle, uint8_t enc_mode,

                       uint8_t role, tBLE_ADDR_TYPE addr_type,

                       bool addr_matched,
@@ -269,13 +257,6 @@ void btm_ble_connected(const RawAddress& bda, uint16_t handle, uint8_t enc_mode, 
      bda, handle, enc_mode, role, addr_type, addr_matched,

      can_read_discoverable_characteristics);

}

tBTM_SEC_ACTION btm_ble_determine_security_act(bool is_originator,

                                               const RawAddress& bdaddr,

                                               uint16_t security_required) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble::btm_ble_determine_security_act(

      is_originator, bdaddr, security_required);

}

bool btm_ble_get_acl_remote_addr(uint16_t hci_handle, RawAddress& conn_addr,

                                 tBLE_ADDR_TYPE* p_addr_type) {

  inc_func_call_count(__func__);
@@ -287,16 +268,6 @@ bool btm_ble_get_enc_key_type(const RawAddress& bd_addr, uint8_t* p_key_types) { 
  return test::mock::stack_btm_ble::btm_ble_get_enc_key_type(bd_addr,

                                                             p_key_types);

}

void btm_ble_increment_sign_ctr(const RawAddress& bd_addr, bool is_local) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::btm_ble_increment_sign_ctr(bd_addr, is_local);

}

uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec,

                                    tBTM_LE_IO_REQ* p_data) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble::btm_ble_io_capabilities_req(p_dev_rec,

                                                                p_data);

}

void btm_ble_link_encrypted(const RawAddress& bd_addr, uint8_t encr_enable) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::btm_ble_link_encrypted(bd_addr, encr_enable);

system/test/mock/mock_stack_btm_ble.h

+0 −58
Original line number Diff line number Diff line
@@ -394,21 +394,6 @@ struct BTM_UseLeLink { 
};

extern struct BTM_UseLeLink BTM_UseLeLink;



// Name: btm_ble_br_keys_req

// Params: tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data

// Return: uint8_t

struct btm_ble_br_keys_req {

  static uint8_t return_value;

  std::function<uint8_t(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data)>

      body{[](tBTM_SEC_DEV_REC* /* p_dev_rec */, tBTM_LE_IO_REQ* /* p_data */) {

        return return_value;

      }};

  uint8_t operator()(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) {

    return body(p_dev_rec, p_data);

  };

};

extern struct btm_ble_br_keys_req btm_ble_br_keys_req;



// Name: btm_ble_connected

// Params: const RawAddress& bda, uint16_t handle, uint8_t enc_mode, uint8_t

// role, tBLE_ADDR_TYPE addr_type, bool addr_matched Return: void
@@ -429,22 +414,6 @@ struct btm_ble_connected { 
};

extern struct btm_ble_connected btm_ble_connected;



// Name: btm_ble_determine_security_act

// Params: bool is_originator, const RawAddress& bdaddr, uint16_t

// security_required Return: tBTM_SEC_ACTION

struct btm_ble_determine_security_act {

  static tBTM_SEC_ACTION return_value;

  std::function<tBTM_SEC_ACTION(bool is_originator, const RawAddress& bdaddr,

                                uint16_t security_required)>

      body{[](bool /* is_originator */, const RawAddress& /* bdaddr */,

              uint16_t /* security_required */) { return return_value; }};

  tBTM_SEC_ACTION operator()(bool is_originator, const RawAddress& bdaddr,

                             uint16_t security_required) {

    return body(is_originator, bdaddr, security_required);

  };

};

extern struct btm_ble_determine_security_act btm_ble_determine_security_act;



// Name: btm_ble_get_acl_remote_addr

// Params: uint16_t hci_handle, RawAddress& conn_addr, tBLE_ADDR_TYPE*

// p_addr_type Return: bool
@@ -476,33 +445,6 @@ struct btm_ble_get_enc_key_type { 
};

extern struct btm_ble_get_enc_key_type btm_ble_get_enc_key_type;



// Name: btm_ble_increment_sign_ctr

// Params: const RawAddress& bd_addr, bool is_local

// Return: void

struct btm_ble_increment_sign_ctr {

  std::function<void(const RawAddress& bd_addr, bool is_local)> body{

      [](const RawAddress& /* bd_addr */, bool /* is_local */) {}};

  void operator()(const RawAddress& bd_addr, bool is_local) {

    body(bd_addr, is_local);

  };

};

extern struct btm_ble_increment_sign_ctr btm_ble_increment_sign_ctr;



// Name: btm_ble_io_capabilities_req

// Params: tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data

// Return: uint8_t

struct btm_ble_io_capabilities_req {

  static uint8_t return_value;

  std::function<uint8_t(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data)>

      body{[](tBTM_SEC_DEV_REC* /* p_dev_rec */, tBTM_LE_IO_REQ* /* p_data */) {

        return return_value;

      }};

  uint8_t operator()(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) {

    return body(p_dev_rec, p_data);

  };

};

extern struct btm_ble_io_capabilities_req btm_ble_io_capabilities_req;



// Name: btm_ble_link_encrypted

// Params: const RawAddress& bd_addr, uint8_t encr_enable

// Return: void