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

Commit 20c62454 authored by Chris Manton's avatar Chris Manton
Browse files

Stat-ify stack::btm::btm_sec_execute_procedure 

Bug: 224999611
Test: gd/cert/run
Tag: #refactor

Change-Id: I854d69dffc14382a4ede2dcaa717e66044c7017d
parent 80eb995e

system/stack/btm/btm_sec.cc

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ extern void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& p_dev_rec); 
 ******************************************************************************/

tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator, uint16_t psm);



static tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_sec_start_get_name(tBTM_SEC_DEV_REC* p_dev_rec);

static void btm_sec_wait_and_start_authentication(tBTM_SEC_DEV_REC* p_dev_rec);

static void btm_sec_auth_timer_timeout(void* data);

system/stack/btm/btm_sec.h

+0 −17
Original line number Diff line number Diff line
@@ -699,23 +699,6 @@ void btm_sec_pin_code_request(const uint8_t* p_event); 
 ******************************************************************************/

void btm_sec_update_clock_offset(uint16_t handle, uint16_t clock_offset);



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

 *

 * Function         btm_sec_execute_procedure

 *

 * Description      This function is called to start required security

 *                  procedure.  There is a case when multiplexing protocol

 *                  calls this function on the originating side, connection to

 *                  the peer will not be established.  This function in this

 *                  case performs only authorization.

 *

 * Returns          BTM_SUCCESS     - permission is granted

 *                  BTM_CMD_STARTED - in process

 *                  BTM_NO_RESOURCES  - permission declined

 *

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

tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);



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

 *

 * Function         btm_sec_find_first_serv

system/test/mock/mock_stack_btm_sec.cc

+0 −4
Original line number Diff line number Diff line
@@ -184,10 +184,6 @@ tBTM_STATUS btm_sec_disconnect(uint16_t handle, tHCI_STATUS reason, 
  mock_function_count_map[__func__]++;

  return BTM_SUCCESS;

}

tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) {

  mock_function_count_map[__func__]++;

  return BTM_SUCCESS;

}

tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm,

                                     bool is_originator,

                                     tBTM_SEC_CALLBACK* p_callback,