Merge "Extra logging around bta dm service discovery" (7469e79a) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+11 −0

Original line number	Diff line number	Diff line
		@@ -924,6 +924,10 @@ void bta_dm_discover(tBTA_DM_MSG* p_data) {
		bta_dm_search_cb.transport = p_data->discover.transport;

		bta_dm_search_cb.name_discover_done = false;

		LOG_INFO("bta_dm_discovery: starting service discovery to %s , transport: %s",
		PRIVATE_ADDRESS(p_data->discover.bd_addr),
		bt_transport_text(p_data->discover.transport).c_str());
		bta_dm_discover_device(p_data->discover.bd_addr);
		}

		@@ -1512,6 +1516,9 @@ void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {
		tBTA_DM_MSG* p_pending_discovery =
		(tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_API_DISCOVER));
		memcpy(p_pending_discovery, p_data, sizeof(tBTA_DM_API_DISCOVER));

		LOG_INFO("bta_dm_discovery: queuing service discovery to %s",
		p_pending_discovery->discover.bd_addr.ToString().c_str());
		fixed_queue_enqueue(bta_dm_search_cb.pending_discovery_queue,
		p_pending_discovery);
		}
		@@ -1804,6 +1811,8 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {

		if (transport == BT_TRANSPORT_LE) {
		if (bta_dm_search_cb.services_to_search & BTA_BLE_SERVICE_MASK) {
		LOG_INFO("bta_dm_discovery: starting GATT discovery on %s",
		PRIVATE_ADDRESS(bta_dm_search_cb.peer_bdaddr));
		// set the raw data buffer here
		memset(g_disc_raw_data_buf, 0, sizeof(g_disc_raw_data_buf));
		/* start GATT for service discovery */
		@@ -1811,6 +1820,8 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {
		return;
		}
		} else {
		LOG_INFO("bta_dm_discovery: starting SDP discovery on %s",
		PRIVATE_ADDRESS(bta_dm_search_cb.peer_bdaddr));
		bta_dm_search_cb.sdp_results = false;
		bta_dm_find_services(bta_dm_search_cb.peer_bdaddr);
		return;