Merge "BTM: Let CSIS active scanning take effect" (3e46ff08) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/csis/csis_client.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1300,7 +1300,7 @@ class CsisClientImpl : public CsisClient {

	instance->OnActiveScanResult(&p_data->inq_res);		instance->OnActiveScanResult(&p_data->inq_res);
	});		});
	BTA_DmBleScan(enable, bluetooth::csis::kDefaultScanDurationS);		BTA_DmBleScan(enable, bluetooth::csis::kDefaultScanDurationS, true);

	/* Need to call it by ourselfs */		/* Need to call it by ourselfs */
	if (!enable) {		if (!enable) {

system/bta/dm/bta_dm_act.cc

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4019,9 +4019,11 @@ void bta_dm_ble_config_local_privacy(bool privacy_enable) {
	BTM_BleConfigPrivacy(privacy_enable);		BTM_BleConfigPrivacy(privacy_enable);
	}		}

	static void bta_dm_start_scan(uint8_t duration_sec) {		static void bta_dm_start_scan(uint8_t duration_sec,
	tBTM_STATUS status = BTM_BleObserve(		bool low_latency_scan = false) {
	true, duration_sec, bta_dm_observe_results_cb, bta_dm_observe_cmpl_cb);		tBTM_STATUS status =
			BTM_BleObserve(true, duration_sec, bta_dm_observe_results_cb,
			bta_dm_observe_cmpl_cb, low_latency_scan);

	if (status != BTM_CMD_STARTED) {		if (status != BTM_CMD_STARTED) {
	tBTA_DM_SEARCH data = {		tBTA_DM_SEARCH data = {
	@@ -4054,7 +4056,8 @@ void bta_dm_ble_observe(bool start, uint8_t duration,
	bta_dm_start_scan(duration);		bta_dm_start_scan(duration);
	}		}

	void bta_dm_ble_scan(bool start, uint8_t duration_sec) {		void bta_dm_ble_scan(bool start, uint8_t duration_sec,
			bool low_latency_scan = false) {
	/* Start or stop only if there is no active main scanner */		/* Start or stop only if there is no active main scanner */
	if (bta_dm_search_cb.p_scan_cback != NULL) return;		if (bta_dm_search_cb.p_scan_cback != NULL) return;

	@@ -4063,7 +4066,7 @@ void bta_dm_ble_scan(bool start, uint8_t duration_sec) {
	return;		return;
	}		}

	bta_dm_start_scan(duration_sec);		bta_dm_start_scan(duration_sec, low_latency_scan);
	}		}

	void bta_dm_ble_csis_observe(bool observe, tBTA_DM_SEARCH_CBACK* p_cback) {		void bta_dm_ble_csis_observe(bool observe, tBTA_DM_SEARCH_CBACK* p_cback) {

system/bta/dm/bta_dm_api.cc

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -605,14 +605,16 @@ void BTA_DmBleObserve(bool start, uint8_t duration,
	* Parameters start: start or stop the scan procedure,		* Parameters start: start or stop the scan procedure,
	* duration_sec: Duration of the scan. Continuous scan if 0 is		* duration_sec: Duration of the scan. Continuous scan if 0 is
	* passed,		* passed,
			* low_latency_scan: whether this is an low latency scan,
			* default is false.
	*		*
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void BTA_DmBleScan(bool start, uint8_t duration_sec) {		void BTA_DmBleScan(bool start, uint8_t duration_sec, bool low_latency_scan) {
	APPL_TRACE_API("%s:start = %d ", __func__, start);		APPL_TRACE_API("%s:start = %d ", __func__, start);
	do_in_main_thread(FROM_HERE,		do_in_main_thread(FROM_HERE, base::Bind(bta_dm_ble_scan, start, duration_sec,
	base::Bind(bta_dm_ble_scan, start, duration_sec));		low_latency_scan));
	}		}

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

system/bta/dm/bta_dm_int.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -538,7 +538,7 @@ 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_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);		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*);
	void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t,		void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t,
	uint16_t, uint16_t, uint16_t, uint16_t);		uint16_t, uint16_t, uint16_t, uint16_t);

system/bta/include/bta_api.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1146,11 +1146,13 @@ void BTA_DmBleObserve(bool start, uint8_t duration,
	* Parameters start: start or stop the scan procedure,		* Parameters start: start or stop the scan procedure,
	* duration_sec: Duration of the scan. Continuous scan if 0 is		* duration_sec: Duration of the scan. Continuous scan if 0 is
	* passed,		* passed,
			* low_latency_scan: whether this is a low latency scan,
			* default is false,
	*		*
	* Returns void		* Returns void
	*		*
	******************************************************************************/		******************************************************************************/
	void BTA_DmBleScan(bool start, uint8_t duration);		void BTA_DmBleScan(bool start, uint8_t duration, bool low_latency_scan = false);

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