Merge "Stat-ify stack::btm::ble_gap::btm_ble_start-stop_scan" (209a7561) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_ble_gap.cc

+9 −4

Original line number	Diff line number	Diff line
		@@ -87,6 +87,11 @@ static const char kPropertyInquiryScanInterval[] =
		static const char kPropertyInquiryScanWindow[] =
		"bluetooth.core.le.inquiry_scan_window";

		static void btm_ble_start_scan();
		static void btm_ble_stop_scan();
		static tBTM_STATUS btm_ble_stop_adv(void);
		static tBTM_STATUS btm_ble_start_adv(void);

		namespace {

		class AdvertisingCache {
		@@ -2953,7 +2958,7 @@ void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* data) {
		* Returns void
		*
		******************************************************************************/
		void btm_ble_start_scan() {
		static void btm_ble_start_scan() {
		tBTM_BLE_INQ_CB* p_inq = &btm_cb.ble_ctr_cb.inq_var;
		/* start scan, disable duplicate filtering */
		btm_send_hci_scan_enable(BTM_BLE_SCAN_ENABLE, BTM_BLE_DUPLICATE_DISABLE);
		@@ -2973,7 +2978,7 @@ void btm_ble_start_scan() {
		* Returns void
		*
		******************************************************************************/
		void btm_ble_stop_scan(void) {
		static void btm_ble_stop_scan(void) {
		BTM_TRACE_EVENT("btm_ble_stop_scan ");

		if (btm_cb.ble_ctr_cb.inq_var.scan_type == BTM_BLE_SCAN_MODE_ACTI)
		@@ -3107,7 +3112,7 @@ static bool btm_ble_adv_states_operation(BTM_TOPOLOGY_FUNC_PTR* p_handler,
		* Returns void
		*
		******************************************************************************/
		tBTM_STATUS btm_ble_start_adv(void) {
		static tBTM_STATUS btm_ble_start_adv(void) {
		tBTM_BLE_INQ_CB* p_cb = &btm_cb.ble_ctr_cb.inq_var;

		if (!btm_ble_adv_states_operation(btm_ble_topology_check, p_cb->evt_type))
		@@ -3128,7 +3133,7 @@ tBTM_STATUS btm_ble_start_adv(void) {
		* Returns void
		*
		******************************************************************************/
		tBTM_STATUS btm_ble_stop_adv(void) {
		static tBTM_STATUS btm_ble_stop_adv(void) {
		tBTM_BLE_INQ_CB* p_cb = &btm_cb.ble_ctr_cb.inq_var;

		if (p_cb->adv_mode == BTM_BLE_ADV_ENABLE) {

system/stack/btm/btm_ble_int.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ extern void btm_send_hci_set_scan_params(uint8_t scan_type, uint16_t scan_int,
		uint16_t scan_win,
		tBLE_ADDR_TYPE addr_type_own,
		uint8_t scan_filter_policy);
		extern void btm_ble_stop_scan(void);
		extern void btm_clear_all_pending_le_entry(void);

		extern void btm_ble_init(void);
		@@ -53,10 +52,6 @@ extern void btm_ble_connected(const RawAddress& bda, uint16_t handle,
		tBLE_ADDR_TYPE addr_type, bool addr_matched,
		bool can_read_discoverable_characteristics);

		extern tBTM_STATUS btm_ble_start_adv(void);
		extern tBTM_STATUS btm_ble_stop_adv(void);
		extern void btm_ble_start_scan(void);

		/* LE security function from btm_sec.cc */
		extern void btm_ble_link_sec_check(const RawAddress& bd_addr,
		tBTM_LE_AUTH_REQ auth_req,

system/test/mock/mock_stack_btm_ble_gap.cc

+0 −10

Original line number	Diff line number	Diff line
		@@ -117,18 +117,10 @@ tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode) {
		mock_function_count_map[__func__]++;
		return BTM_SUCCESS;
		}
		tBTM_STATUS btm_ble_start_adv(void) {
		mock_function_count_map[__func__]++;
		return BTM_SUCCESS;
		}
		tBTM_STATUS btm_ble_start_inquiry(uint8_t duration) {
		mock_function_count_map[__func__]++;
		return BTM_SUCCESS;
		}
		tBTM_STATUS btm_ble_stop_adv(void) {
		mock_function_count_map[__func__]++;
		return BTM_SUCCESS;
		}
		uint16_t BTM_BleReadConnectability() {
		mock_function_count_map[__func__]++;
		return 0;
		@@ -200,9 +192,7 @@ void btm_ble_read_remote_name_cmpl(bool status, const RawAddress& bda,
		void btm_ble_set_adv_flag(uint16_t connect_mode, uint16_t disc_mode) {
		mock_function_count_map[__func__]++;
		}
		void btm_ble_start_scan() { mock_function_count_map[__func__]++; }
		void btm_ble_stop_inquiry(void) { mock_function_count_map[__func__]++; }
		void btm_ble_stop_scan(void) { mock_function_count_map[__func__]++; }
		void btm_ble_update_dmt_flag_bits(uint8_t* adv_flag_value,
		const uint16_t connect_mode,
		const uint16_t disc_mode) {