Merge "[Invisalign2] Remove mock of btm_sec_execute_procedure" into main (bc2fea5e) · Commits · e / os / android_packages_modules_Bluetooth

system/test/mock/mock_stack_btm_sec.cc

+1 −6

system/test/mock/mock_stack_btm_sec.h

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -685,19 +685,6 @@ struct btm_sec_encrypt_change {
	};		};
	extern struct btm_sec_encrypt_change btm_sec_encrypt_change;		extern struct btm_sec_encrypt_change btm_sec_encrypt_change;

	// Name: btm_sec_execute_procedure
	// Params: tBTM_SEC_DEV_REC* p_dev_rec
	// Return: tBTM_STATUS
	struct btm_sec_execute_procedure {
	static tBTM_STATUS return_value;
	std::function<tBTM_STATUS(tBTM_SEC_DEV_REC* p_dev_rec)> body{
	[](tBTM_SEC_DEV_REC* /* p_dev_rec */) { return return_value; }};
	tBTM_STATUS operator()(tBTM_SEC_DEV_REC* p_dev_rec) {
	return body(p_dev_rec);
	};
	};
	extern struct btm_sec_execute_procedure btm_sec_execute_procedure;

	// Name: btm_sec_find_first_serv		// Name: btm_sec_find_first_serv
	// Params: bool is_originator, uint16_t psm		// Params: bool is_originator, uint16_t psm
	// Return: tBTM_SEC_SERV_REC*		// Return: tBTM_SEC_SERV_REC*

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,6 @@ struct btm_sec_dev_reset btm_sec_dev_reset;
	struct btm_sec_disconnect btm_sec_disconnect;		struct btm_sec_disconnect btm_sec_disconnect;
	struct btm_sec_disconnected btm_sec_disconnected;		struct btm_sec_disconnected btm_sec_disconnected;
	struct btm_sec_encrypt_change btm_sec_encrypt_change;		struct btm_sec_encrypt_change btm_sec_encrypt_change;
	struct btm_sec_execute_procedure btm_sec_execute_procedure;
	struct btm_sec_find_first_serv btm_sec_find_first_serv;		struct btm_sec_find_first_serv btm_sec_find_first_serv;
	struct btm_sec_is_a_bonded_dev btm_sec_is_a_bonded_dev;		struct btm_sec_is_a_bonded_dev btm_sec_is_a_bonded_dev;
	struct btm_sec_l2cap_access_req btm_sec_l2cap_access_req;		struct btm_sec_l2cap_access_req btm_sec_l2cap_access_req;
	@@ -144,7 +143,6 @@ bool BTM_SetSecurityLevel::return_value = false;
	const uint8_t* btm_get_dev_class::return_value = nullptr;		const uint8_t* btm_get_dev_class::return_value = nullptr;
	tBTM_STATUS btm_sec_bond_by_transport::return_value = 0;		tBTM_STATUS btm_sec_bond_by_transport::return_value = 0;
	tBTM_STATUS btm_sec_disconnect::return_value = 0;		tBTM_STATUS btm_sec_disconnect::return_value = 0;
	tBTM_STATUS btm_sec_execute_procedure::return_value = 0;
	tBTM_SEC_SERV_REC* btm_sec_find_first_serv::return_value = nullptr;		tBTM_SEC_SERV_REC* btm_sec_find_first_serv::return_value = nullptr;
	bool btm_sec_is_a_bonded_dev::return_value = false;		bool btm_sec_is_a_bonded_dev::return_value = false;
	tBTM_STATUS btm_sec_l2cap_access_req::return_value = 0;		tBTM_STATUS btm_sec_l2cap_access_req::return_value = 0;
	@@ -390,10 +388,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status,
	test::mock::stack_btm_sec::btm_sec_encrypt_change(handle, status,		test::mock::stack_btm_sec::btm_sec_encrypt_change(handle, status,
	encr_enable);		encr_enable);
	}		}
	tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) {
	inc_func_call_count(__func__);
	return test::mock::stack_btm_sec::btm_sec_execute_procedure(p_dev_rec);
	}
	tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator, uint16_t psm) {		tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator, uint16_t psm) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	return test::mock::stack_btm_sec::btm_sec_find_first_serv(is_originator, psm);		return test::mock::stack_btm_sec::btm_sec_find_first_serv(is_originator, psm);