IA2: Stat-ify bta::dm::bta_dm_disc components (58271e92) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_disc.cc

+35 −21

Original line number	Original line	Diff line number	Diff line
	@@ -69,6 +69,7 @@ constexpr char kBtmLogTag[] = "SDP";
	static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status);		static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status);
	static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,		static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir,
	uint16_t eir_len);		uint16_t eir_len);
			static void bta_dm_inq_cmpl(uint8_t num);
	static void bta_dm_inq_cmpl_cb(void* p_result);		static void bta_dm_inq_cmpl_cb(void* p_result);
	static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,		static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,
	DEV_CLASS dc,		DEV_CLASS dc,
	@@ -90,6 +91,11 @@ static void bta_dm_disable_search_and_disc(void);
	static void bta_dm_gattc_register(void);		static void bta_dm_gattc_register(void);
	static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr);		static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr);
	static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data);		static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data);
			static void bta_dm_search_cmpl();
			static void bta_dm_free_sdp_db();
			static void bta_dm_execute_queued_request();
			static void bta_dm_search_cancel_notify();
			static void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data);

	TimestampedStringCircularBuffer disc_gatt_history_{50};		TimestampedStringCircularBuffer disc_gatt_history_{50};

	@@ -234,12 +240,14 @@ const uint16_t bta_service_id_to_uuid_lkup_tbl[BTA_MAX_SERVICE_ID] = {
	};		};

	#define MAX_DISC_RAW_DATA_BUF (4096)		#define MAX_DISC_RAW_DATA_BUF (4096)
	uint8_t g_disc_raw_data_buf[MAX_DISC_RAW_DATA_BUF];		static uint8_t g_disc_raw_data_buf[MAX_DISC_RAW_DATA_BUF];

	void bta_dm_search_set_state(tBTA_DM_STATE state) {		static void bta_dm_search_set_state(tBTA_DM_STATE state) {
	bta_dm_search_cb.state = state;		bta_dm_search_cb.state = state;
	}		}
	tBTA_DM_STATE bta_dm_search_get_state() { return bta_dm_search_cb.state; }		static tBTA_DM_STATE bta_dm_search_get_state() {
			return bta_dm_search_cb.state;
			}

	/*******************************************************************************		/*******************************************************************************
	*		*
	@@ -251,7 +259,7 @@ tBTA_DM_STATE bta_dm_search_get_state() { return bta_dm_search_cb.state; }
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_start(tBTA_DM_MSG* p_data) {		static void bta_dm_search_start(tBTA_DM_MSG* p_data) {
	bta_dm_gattc_register();		bta_dm_gattc_register();

	APPL_TRACE_DEBUG("%s avoid_scatter=%d", __func__,		APPL_TRACE_DEBUG("%s avoid_scatter=%d", __func__,
	@@ -288,7 +296,7 @@ void bta_dm_search_start(tBTA_DM_MSG* p_data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_cancel() {		static void bta_dm_search_cancel() {
	if (BTM_IsInquiryActive()) {		if (BTM_IsInquiryActive()) {
	BTM_CancelInquiry();		BTM_CancelInquiry();
	bta_dm_search_cancel_notify();		bta_dm_search_cancel_notify();
	@@ -314,7 +322,7 @@ void bta_dm_search_cancel() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_discover(tBTA_DM_MSG* p_data) {		static void bta_dm_discover(tBTA_DM_MSG* p_data) {
	/* save the search condition */		/* save the search condition */
	bta_dm_search_cb.services = BTA_ALL_SERVICE_MASK;		bta_dm_search_cb.services = BTA_ALL_SERVICE_MASK;

	@@ -415,7 +423,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_inq_cmpl(uint8_t num) {		static void bta_dm_inq_cmpl(uint8_t num) {
	if (bta_dm_search_get_state() == BTA_DM_SEARCH_CANCELLING) {		if (bta_dm_search_get_state() == BTA_DM_SEARCH_CANCELLING) {
	bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);		bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);
	bta_dm_execute_queued_request();		bta_dm_execute_queued_request();
	@@ -447,7 +455,7 @@ void bta_dm_inq_cmpl(uint8_t num) {
	}		}
	}		}

	void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data) {		static void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data) {
	CHECK(p_data != nullptr);		CHECK(p_data != nullptr);

	const tBTA_DM_REMOTE_NAME& remote_name_msg = p_data->remote_name_msg;		const tBTA_DM_REMOTE_NAME& remote_name_msg = p_data->remote_name_msg;
	@@ -580,7 +588,7 @@ static void bta_dm_store_audio_profiles_version() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_sdp_result(tBTA_DM_MSG* p_data) {		static void bta_dm_sdp_result(tBTA_DM_MSG* p_data) {
	tSDP_DISC_REC* p_sdp_rec = NULL;		tSDP_DISC_REC* p_sdp_rec = NULL;
	tBTA_DM_MSG* p_msg;		tBTA_DM_MSG* p_msg;
	bool scn_found = false;		bool scn_found = false;
	@@ -837,7 +845,7 @@ static void bta_dm_read_dis_cmpl(const RawAddress& addr,
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_cmpl() {		static void bta_dm_search_cmpl() {
	bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);		bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

	uint16_t conn_id = bta_dm_search_cb.conn_id;		uint16_t conn_id = bta_dm_search_cb.conn_id;
	@@ -916,7 +924,7 @@ void bta_dm_search_cmpl() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_disc_result(tBTA_DM_MSG* p_data) {		static void bta_dm_disc_result(tBTA_DM_MSG* p_data) {
	APPL_TRACE_EVENT("%s", __func__);		APPL_TRACE_EVENT("%s", __func__);

	/* disc_res.device_type is set only when GATT discovery is finished in		/* disc_res.device_type is set only when GATT discovery is finished in
	@@ -946,7 +954,7 @@ void bta_dm_disc_result(tBTA_DM_MSG* p_data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_result(tBTA_DM_MSG* p_data) {		static void bta_dm_search_result(tBTA_DM_MSG* p_data) {
	APPL_TRACE_DEBUG("%s searching:0x%04x, result:0x%04x", __func__,		APPL_TRACE_DEBUG("%s searching:0x%04x, result:0x%04x", __func__,
	bta_dm_search_cb.services,		bta_dm_search_cb.services,
	p_data->disc_result.result.disc_res.services);		p_data->disc_result.result.disc_res.services);
	@@ -1000,7 +1008,7 @@ static void bta_dm_search_timer_cback(UNUSED_ATTR void* data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_free_sdp_db() {		static void bta_dm_free_sdp_db() {
	osi_free_and_reset((void**)&bta_dm_search_cb.p_sdp_db);		osi_free_and_reset((void**)&bta_dm_search_cb.p_sdp_db);
	}		}

	@@ -1013,7 +1021,7 @@ void bta_dm_free_sdp_db() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_queue_search(tBTA_DM_MSG* p_data) {		static void bta_dm_queue_search(tBTA_DM_MSG* p_data) {
	if (bta_dm_search_cb.p_pending_search) {		if (bta_dm_search_cb.p_pending_search) {
	LOG_WARN("Overwrote previous device discovery inquiry scan request");		LOG_WARN("Overwrote previous device discovery inquiry scan request");
	}		}
	@@ -1033,7 +1041,7 @@ void bta_dm_queue_search(tBTA_DM_MSG* p_data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {		static void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {
	tBTA_DM_MSG* p_pending_discovery =		tBTA_DM_MSG* p_pending_discovery =
	(tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_API_DISCOVER));		(tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_API_DISCOVER));
	memcpy(p_pending_discovery, p_data, sizeof(tBTA_DM_API_DISCOVER));		memcpy(p_pending_discovery, p_data, sizeof(tBTA_DM_API_DISCOVER));
	@@ -1053,7 +1061,7 @@ void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_execute_queued_request() {		static void bta_dm_execute_queued_request() {
	tBTA_DM_MSG* p_pending_discovery = (tBTA_DM_MSG*)fixed_queue_try_dequeue(		tBTA_DM_MSG* p_pending_discovery = (tBTA_DM_MSG*)fixed_queue_try_dequeue(
	bta_dm_search_cb.pending_discovery_queue);		bta_dm_search_cb.pending_discovery_queue);
	if (p_pending_discovery) {		if (p_pending_discovery) {
	@@ -1088,7 +1096,7 @@ bool bta_dm_is_search_request_queued() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_clear_queue() {		static void bta_dm_search_clear_queue() {
	osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);		osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);
	if (bluetooth::common::InitFlags::		if (bluetooth::common::InitFlags::
	IsBtmDmFlushDiscoveryQueueOnSearchCancel()) {		IsBtmDmFlushDiscoveryQueueOnSearchCancel()) {
	@@ -1105,7 +1113,7 @@ void bta_dm_search_clear_queue() {
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_search_cancel_notify() {		static void bta_dm_search_cancel_notify() {
	if (bta_dm_search_cb.p_search_cback) {		if (bta_dm_search_cb.p_search_cback) {
	bta_dm_search_cb.p_search_cback(BTA_DM_SEARCH_CANCEL_CMPL_EVT, NULL);		bta_dm_search_cb.p_search_cback(BTA_DM_SEARCH_CANCEL_CMPL_EVT, NULL);
	}		}
	@@ -1936,7 +1944,7 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) {
	* Parameters:		* Parameters:
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data) {		static void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data) {
	if (bta_dm_search_cb.conn_id != GATT_INVALID_CONN_ID)		if (bta_dm_search_cb.conn_id != GATT_INVALID_CONN_ID)
	BTA_GATTC_Close(bta_dm_search_cb.conn_id);		BTA_GATTC_Close(bta_dm_search_cb.conn_id);

	@@ -1953,7 +1961,7 @@ void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data) {
	* Parameters:		* Parameters:
	*		*
	******************************************************************************/		******************************************************************************/
	void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) {		static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) {
	constexpr bool kUseOpportunistic = true;		constexpr bool kUseOpportunistic = true;

	bta_dm_search_cb.gatt_disc_active = true;		bta_dm_search_cb.gatt_disc_active = true;
	@@ -2000,7 +2008,7 @@ void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) {
	* Parameters:		* Parameters:
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) {		static void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) {
	VLOG(1) << "DM Search state= " << bta_dm_search_get_state()		VLOG(1) << "DM Search state= " << bta_dm_search_get_state()
	<< " search_cb.peer_dbaddr:" << bta_dm_search_cb.peer_bdaddr		<< " search_cb.peer_dbaddr:" << bta_dm_search_cb.peer_bdaddr
	<< " connected_bda=" << p_data->remote_bda.address;		<< " connected_bda=" << p_data->remote_bda.address;
	@@ -2147,6 +2155,12 @@ tBT_TRANSPORT bta_dm_determine_discovery_transport(const RawAddress& bd_addr) {
	return ::bta_dm_determine_discovery_transport(bd_addr);		return ::bta_dm_determine_discovery_transport(bd_addr);
	}		}

			void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data) {
			::bta_dm_remote_name_cmpl(p_data);
			}

			void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { ::bta_dm_sdp_result(p_data); }

	} // namespace testing		} // namespace testing
	} // namespace legacy		} // namespace legacy
	} // namespace bluetooth		} // namespace bluetooth

system/bta/dm/bta_dm_int.h

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -557,7 +557,6 @@ void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept,
	void bta_dm_ble_confirm_reply(const RawAddress&, bool);		void bta_dm_ble_confirm_reply(const RawAddress&, bool);
	void bta_dm_ble_set_conn_params(const RawAddress&, uint16_t, uint16_t, uint16_t,		void bta_dm_ble_set_conn_params(const RawAddress&, uint16_t, uint16_t, uint16_t,
	uint16_t);		uint16_t);
	void bta_dm_close_gatt_conn(tBTA_DM_MSG* p_data);
	void bta_dm_ble_observe(bool, uint8_t, tBTA_DM_SEARCH_CBACK*);		void bta_dm_ble_observe(bool, uint8_t, tBTA_DM_SEARCH_CBACK*);
	void bta_dm_ble_scan(bool, uint8_t, bool);		void bta_dm_ble_scan(bool, uint8_t, bool);
	void bta_dm_ble_csis_observe(bool, tBTA_DM_SEARCH_CBACK*);		void bta_dm_ble_csis_observe(bool, tBTA_DM_SEARCH_CBACK*);
	@@ -579,23 +578,8 @@ void bta_dm_init_pm(void);
	void bta_dm_disable_pm(void);		void bta_dm_disable_pm(void);

	uint8_t bta_dm_get_av_count(void);		uint8_t bta_dm_get_av_count(void);
	void bta_dm_search_start(tBTA_DM_MSG* p_data);
	void bta_dm_search_cancel();
	void bta_dm_discover(tBTA_DM_MSG* p_data);
	void bta_dm_inq_cmpl(uint8_t num);
	void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data);
	void bta_dm_sdp_result(tBTA_DM_MSG* p_data);
	void bta_dm_search_cmpl();
	void bta_dm_free_sdp_db();
	void bta_dm_disc_result(tBTA_DM_MSG* p_data);
	void bta_dm_search_result(tBTA_DM_MSG* p_data);
	void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);		void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);
	void bta_dm_queue_search(tBTA_DM_MSG* p_data);
	void bta_dm_queue_disc(tBTA_DM_MSG* p_data);
	void bta_dm_execute_queued_request();
	bool bta_dm_is_search_request_queued();		bool bta_dm_is_search_request_queued();
	void bta_dm_search_clear_queue();
	void bta_dm_search_cancel_notify();
	tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr);		tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr);

	void bta_dm_clear_event_filter(void);		void bta_dm_clear_event_filter(void);
	@@ -614,9 +598,6 @@ void bta_dm_set_event_filter_inquiry_result_all_devices();

	void bta_dm_ble_reset_id(void);		void bta_dm_ble_reset_id(void);

	tBTA_DM_STATE bta_dm_search_get_state();
	void bta_dm_search_set_state(tBTA_DM_STATE state);

	void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);		void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);
	void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding);		void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding);

system/bta/test/bta_dm_test.cc

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -75,8 +75,9 @@ namespace bluetooth {
	namespace legacy {		namespace legacy {
	namespace testing {		namespace testing {

	void bta_dm_init_cb();
	void bta_dm_deinit_cb();		void bta_dm_deinit_cb();
			void bta_dm_init_cb();
			void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data);

	} // namespace testing		} // namespace testing
	} // namespace legacy		} // namespace legacy
	@@ -570,7 +571,7 @@ TEST_F(BtaDmTest, bta_dm_remote_name_cmpl) {
	.hci_status = HCI_SUCCESS,		.hci_status = HCI_SUCCESS,
	},		},
	};		};
	bta_dm_remote_name_cmpl(&msg);		bluetooth::legacy::testing::bta_dm_remote_name_cmpl(&msg);
	ASSERT_EQ(1, get_func_call_count("BTM_InqDbRead"));		ASSERT_EQ(1, get_func_call_count("BTM_InqDbRead"));
	}		}

system/bta/test/bta_sdp_test.cc

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,16 @@ namespace {
	const char kName[] = "Hello";		const char kName[] = "Hello";
	}		}

			namespace bluetooth {
			namespace legacy {
			namespace testing {

			void bta_dm_sdp_result(tBTA_DM_MSG* p_data);

			} // namespace testing
			} // namespace legacy
			} // namespace bluetooth

	class BtaSdpTest : public testing::Test {		class BtaSdpTest : public testing::Test {
	protected:		protected:
	void SetUp() override {		void SetUp() override {
	@@ -108,5 +118,5 @@ TEST_F(BtaSdpRegisteredTest, bta_dm_sdp_result_SDP_SUCCESS) {
	[](const RawAddress& bd_addr) -> const char* { return kName; };		[](const RawAddress& bd_addr) -> const char* { return kName; };
	btm_client_interface.security.BTM_SecDeleteRmtNameNotifyCallback =		btm_client_interface.security.BTM_SecDeleteRmtNameNotifyCallback =
	[](tBTM_RMT_NAME_CALLBACK*) -> bool { return true; };		[](tBTM_RMT_NAME_CALLBACK*) -> bool { return true; };
	bta_dm_sdp_result(&msg);		bluetooth::legacy::testing::bta_dm_sdp_result(&msg);
	}		}

system/test/mock/mock_bta_dm_act.cc

+0 −80

Original line number	Original line	Diff line number	Diff line
	@@ -65,36 +65,20 @@ struct bta_dm_bond_cancel bta_dm_bond_cancel;
	struct bta_dm_check_if_only_hd_connected bta_dm_check_if_only_hd_connected;		struct bta_dm_check_if_only_hd_connected bta_dm_check_if_only_hd_connected;
	struct bta_dm_ci_rmt_oob_act bta_dm_ci_rmt_oob_act;		struct bta_dm_ci_rmt_oob_act bta_dm_ci_rmt_oob_act;
	struct bta_dm_close_acl bta_dm_close_acl;		struct bta_dm_close_acl bta_dm_close_acl;
	struct bta_dm_close_gatt_conn bta_dm_close_gatt_conn;
	struct bta_dm_confirm bta_dm_confirm;		struct bta_dm_confirm bta_dm_confirm;
	struct bta_dm_disable bta_dm_disable;		struct bta_dm_disable bta_dm_disable;
	struct bta_dm_disc_result bta_dm_disc_result;
	struct bta_dm_remote_name_cmpl bta_dm_remote_name_cmpl;
	struct bta_dm_discover bta_dm_discover;
	struct bta_dm_eir_update_cust_uuid bta_dm_eir_update_cust_uuid;		struct bta_dm_eir_update_cust_uuid bta_dm_eir_update_cust_uuid;
	struct bta_dm_eir_update_uuid bta_dm_eir_update_uuid;		struct bta_dm_eir_update_uuid bta_dm_eir_update_uuid;
	struct bta_dm_enable bta_dm_enable;		struct bta_dm_enable bta_dm_enable;
	struct bta_dm_encrypt_cback bta_dm_encrypt_cback;		struct bta_dm_encrypt_cback bta_dm_encrypt_cback;
	struct bta_dm_execute_queued_request bta_dm_execute_queued_request;
	struct bta_dm_free_sdp_db bta_dm_free_sdp_db;
	struct bta_dm_inq_cmpl bta_dm_inq_cmpl;
	struct bta_dm_is_search_request_queued bta_dm_is_search_request_queued;		struct bta_dm_is_search_request_queued bta_dm_is_search_request_queued;
	struct bta_dm_pin_reply bta_dm_pin_reply;		struct bta_dm_pin_reply bta_dm_pin_reply;
	struct bta_dm_process_remove_device bta_dm_process_remove_device;		struct bta_dm_process_remove_device bta_dm_process_remove_device;
	struct bta_dm_queue_disc bta_dm_queue_disc;
	struct bta_dm_queue_search bta_dm_queue_search;
	struct bta_dm_remove_device bta_dm_remove_device;		struct bta_dm_remove_device bta_dm_remove_device;
	struct bta_dm_rm_cback bta_dm_rm_cback;		struct bta_dm_rm_cback bta_dm_rm_cback;
	struct bta_dm_sdp_result bta_dm_sdp_result;		struct bta_dm_sdp_result bta_dm_sdp_result;
	struct bta_dm_search_cancel bta_dm_search_cancel;
	struct bta_dm_search_cancel_notify bta_dm_search_cancel_notify;
	struct bta_dm_search_clear_queue bta_dm_search_clear_queue;
	struct bta_dm_search_cmpl bta_dm_search_cmpl;
	struct bta_dm_search_result bta_dm_search_result;
	struct bta_dm_search_start bta_dm_search_start;
	struct bta_dm_set_dev_name bta_dm_set_dev_name;		struct bta_dm_set_dev_name bta_dm_set_dev_name;
	struct bta_dm_set_encryption bta_dm_set_encryption;		struct bta_dm_set_encryption bta_dm_set_encryption;
	struct btm_dm_start_gatt_discovery btm_dm_start_gatt_discovery;
	struct handle_remote_features_complete handle_remote_features_complete;		struct handle_remote_features_complete handle_remote_features_complete;

	} // namespace bta_dm_act		} // namespace bta_dm_act
	@@ -232,10 +216,6 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_close_acl(bd_addr, remove_dev, transport);		test::mock::bta_dm_act::bta_dm_close_acl(bd_addr, remove_dev, transport);
	}		}
	void bta_dm_close_gatt_conn(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_close_gatt_conn(p_data);
	}
	void bta_dm_confirm(const RawAddress& bd_addr, bool accept) {		void bta_dm_confirm(const RawAddress& bd_addr, bool accept) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_confirm(bd_addr, accept);		test::mock::bta_dm_act::bta_dm_confirm(bd_addr, accept);
	@@ -244,18 +224,6 @@ void bta_dm_disable() {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_disable();		test::mock::bta_dm_act::bta_dm_disable();
	}		}
	void bta_dm_disc_result(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_disc_result(p_data);
	}
	void bta_dm_remote_name_cmpl(const tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_remote_name_cmpl(p_data);
	}
	void bta_dm_discover(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_discover(p_data);
	}
	void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID& curr, bool adding) {		void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID& curr, bool adding) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_eir_update_cust_uuid(curr, adding);		test::mock::bta_dm_act::bta_dm_eir_update_cust_uuid(curr, adding);
	@@ -274,18 +242,6 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport,
	test::mock::bta_dm_act::bta_dm_encrypt_cback(bd_addr, transport, p_ref_data,		test::mock::bta_dm_act::bta_dm_encrypt_cback(bd_addr, transport, p_ref_data,
	result);		result);
	}		}
	void bta_dm_execute_queued_request() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_execute_queued_request();
	}
	void bta_dm_free_sdp_db() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_free_sdp_db();
	}
	void bta_dm_inq_cmpl(uint8_t num) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_inq_cmpl(num);
	}
	bool bta_dm_is_search_request_queued() {		bool bta_dm_is_search_request_queued() {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	return test::mock::bta_dm_act::bta_dm_is_search_request_queued();		return test::mock::bta_dm_act::bta_dm_is_search_request_queued();
	@@ -298,14 +254,6 @@ void bta_dm_process_remove_device(const RawAddress& bd_addr) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_process_remove_device(bd_addr);		test::mock::bta_dm_act::bta_dm_process_remove_device(bd_addr);
	}		}
	void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_queue_disc(p_data);
	}
	void bta_dm_queue_search(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_queue_search(p_data);
	}
	void bta_dm_remove_device(const RawAddress& bd_addr) {		void bta_dm_remove_device(const RawAddress& bd_addr) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_remove_device(bd_addr);		test::mock::bta_dm_act::bta_dm_remove_device(bd_addr);
	@@ -319,30 +267,6 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_sdp_result(p_data);		test::mock::bta_dm_act::bta_dm_sdp_result(p_data);
	}		}
	void bta_dm_search_cancel() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_cancel();
	}
	void bta_dm_search_cancel_notify() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_cancel_notify();
	}
	void bta_dm_search_clear_queue() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_clear_queue();
	}
	void bta_dm_search_cmpl() {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_cmpl();
	}
	void bta_dm_search_result(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_result(p_data);
	}
	void bta_dm_search_start(tBTA_DM_MSG* p_data) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_search_start(p_data);
	}
	void bta_dm_set_dev_name(const std::vector<uint8_t>& name) {		void bta_dm_set_dev_name(const std::vector<uint8_t>& name) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::bta_dm_set_dev_name(name);		test::mock::bta_dm_act::bta_dm_set_dev_name(name);
	@@ -354,10 +278,6 @@ void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport,
	test::mock::bta_dm_act::bta_dm_set_encryption(bd_addr, transport, p_callback,		test::mock::bta_dm_act::bta_dm_set_encryption(bd_addr, transport, p_callback,
	sec_act);		sec_act);
	}		}
	void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) {
	inc_func_call_count(__func__);
	test::mock::bta_dm_act::btm_dm_start_gatt_discovery(bd_addr);
	}
	void handle_remote_features_complete(const RawAddress& bd_addr) {		void handle_remote_features_complete(const RawAddress& bd_addr) {
	inc_func_call_count(__func__);		inc_func_call_count(__func__);
	test::mock::bta_dm_act::handle_remote_features_complete(bd_addr);		test::mock::bta_dm_act::handle_remote_features_complete(bd_addr);