Merge "Remove dead code - BTA_DmBleObserve" into main (e8556e76) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_api.cc

+1 −24

Original line number	Diff line number	Diff line
		@@ -325,34 +325,11 @@ void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,
		remove_dev, transport));
		}

		/*******************************************************************************
		*
		* Function BTA_DmBleObserve
		*
		* Description This procedure keep the device listening for advertising
		* events from a broadcast device.
		*
		* Parameters start: start or stop observe.
		*
		* Returns void

		*
		* Returns void.
		*
		******************************************************************************/
		void BTA_DmBleObserve(bool start, uint8_t duration,
		tBTA_DM_SEARCH_CBACK* p_results_cb) {
		log::verbose("start = {}", start);
		do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_ble_observe, start,
		duration, p_results_cb));
		}

		/*******************************************************************************
		*
		* Function BTA_DmBleScan
		*
		* Description Start or stop the scan procedure if it's not already started
		* with BTA_DmBleObserve().
		* Description 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

+1 −20

Original line number	Diff line number	Diff line
		@@ -675,30 +675,11 @@ void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr,
		uint16_t peripheral_latency,
		uint16_t supervision_tout);

		/*******************************************************************************
		*
		* Function BTA_DmBleObserve
		*
		* Description This procedure keep the device listening for advertising
		* events from a broadcast device.
		*
		* Parameters start: start or stop observe.
		* duration : Duration of the scan. Continuous scan if 0 is
		* passed
		* p_results_cb: Callback to be called with scan results
		*
		* Returns void
		*
		******************************************************************************/
		void BTA_DmBleObserve(bool start, uint8_t duration,
		tBTA_DM_SEARCH_CBACK* p_results_cb);

		/*******************************************************************************
		*
		* Function BTA_DmBleScan
		*
		* Description Start or stop the scan procedure if it's not already started
		* with BTA_DmBleObserve().
		* Description 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

+0 −6

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ struct BTA_DmBleConfigLocalPrivacy BTA_DmBleConfigLocalPrivacy;
		struct BTA_DmBleConfirmReply BTA_DmBleConfirmReply;
		struct BTA_DmBleCsisObserve BTA_DmBleCsisObserve;
		struct BTA_DmBleGetEnergyInfo BTA_DmBleGetEnergyInfo;
		struct BTA_DmBleObserve BTA_DmBleObserve;
		struct BTA_DmBlePasskeyReply BTA_DmBlePasskeyReply;
		struct BTA_DmBleRequestMaxTxDataLength BTA_DmBleRequestMaxTxDataLength;
		struct BTA_DmBleResetId BTA_DmBleResetId;
		@@ -146,11 +145,6 @@ void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback) {
		inc_func_call_count(__func__);
		test::mock::bta_dm_api::BTA_DmBleGetEnergyInfo(p_cmpl_cback);
		}
		void BTA_DmBleObserve(bool start, uint8_t duration,
		tBTA_DM_SEARCH_CBACK* p_results_cb) {
		inc_func_call_count(__func__);
		test::mock::bta_dm_api::BTA_DmBleObserve(start, duration, p_results_cb);
		}
		void BTA_DmBlePasskeyReply(const RawAddress& bd_addr, bool accept,
		uint32_t passkey) {
		inc_func_call_count(__func__);

+0 −15

Original line number	Diff line number	Diff line
		@@ -160,21 +160,6 @@ struct BTA_DmBleGetEnergyInfo {
		};
		extern struct BTA_DmBleGetEnergyInfo BTA_DmBleGetEnergyInfo;

		// Name: BTA_DmBleObserve
		// Params: bool start, uint8_t duration, tBTA_DM_SEARCH_CBACK* p_results_cb
		// Return: void
		struct BTA_DmBleObserve {
		std::function<void(bool start, uint8_t duration,
		tBTA_DM_SEARCH_CBACK* p_results_cb)>
		body{[](bool /* start /, uint8_t / duration */,
		tBTA_DM_SEARCH_CBACK* /* p_results_cb */) {}};
		void operator()(bool start, uint8_t duration,
		tBTA_DM_SEARCH_CBACK* p_results_cb) {
		body(start, duration, p_results_cb);
		};
		};
		extern struct BTA_DmBleObserve BTA_DmBleObserve;

		// Name: BTA_DmBlePasskeyReply
		// Params: const RawAddress& bd_addr, bool accept, uint32_t passkey
		// Return: void