Merge "Invert priority queue order disc > search" (bd88eaf8) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1657,17 +1657,15 @@ void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {
	*		*
	******************************************************************************/		******************************************************************************/
	void bta_dm_execute_queued_request() {		void bta_dm_execute_queued_request() {
	if (bta_dm_search_cb.p_pending_search) {
	LOG_INFO("%s Start pending search", __func__);
	bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);
	bta_dm_search_cb.p_pending_search = NULL;
	} else {
	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) {
	LOG_INFO("%s Start pending discovery", __func__);		LOG_INFO("%s Start pending discovery", __func__);
	bta_sys_sendmsg(p_pending_discovery);		bta_sys_sendmsg(p_pending_discovery);
	}		} else if (bta_dm_search_cb.p_pending_search) {
			LOG_INFO("%s Start pending search", __func__);
			bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);
			bta_dm_search_cb.p_pending_search = NULL;
	}		}
	}		}