Merge "Remove separate_service_and_device_discovery" into main (d63028c4) · Commits · e / os / android_packages_modules_Bluetooth

flags/bta_dm.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -22,13 +22,6 @@ flag {
		bug: "329642681"
		}

		flag {
		name: "separate_service_and_device_discovery"
		namespace: "bluetooth"
		description: "Separate service and device discovery state machines such that one does not block on another"
		bug: "335732980"
		}

		flag {
		name: "bta_dm_discover_both"
		namespace: "bluetooth"

system/bta/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ filegroup {
		"dm/bta_dm_ci.cc",
		"dm/bta_dm_device_search.cc",
		"dm/bta_dm_disc.cc",
		"dm/bta_dm_disc_legacy.cc",
		"dm/bta_dm_disc_sdp.cc",
		"dm/bta_dm_gatt_client.cc",
		"dm/bta_dm_main.cc",

system/bta/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ static_library("bta") {
		"dm/bta_dm_ci.cc",
		"dm/bta_dm_device_search.cc",
		"dm/bta_dm_disc.cc",
		"dm/bta_dm_disc_legacy.cc",
		"dm/bta_dm_disc_sdp.cc",
		"dm/bta_dm_gatt_client.cc",
		"dm/bta_dm_main.cc",

system/bta/dm/bta_dm_act.cc

+3 −9

Original line number	Diff line number	Diff line
		@@ -319,12 +319,9 @@ void bta_dm_disable() {
		bta_dm_disable_pm();
		}

		if (com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		bta_dm_disc_disable_search();
		bta_dm_disc_disable_disc();
		} else {
		bta_dm_disc_disable_search_and_disc();
		}

		bta_dm_cb.disabling = true;

		connection_manager::reset(false);
		@@ -889,8 +886,6 @@ static void bta_dm_acl_down_(const RawAddress& bd_addr, tBT_TRANSPORT transport)
		bta_dm_cb.device_list.le_count--;
		}

		bta_dm_disc_acl_down(bd_addr, transport);

		if (bta_dm_cb.disabling) {
		if (!BTM_GetNumAclLinks()) {
		/*
		@@ -952,7 +947,6 @@ static void bta_dm_acl_down(const RawAddress& bd_addr, tBT_TRANSPORT transport)
		bta_dm_cb.device_list.le_count--;
		}

		bta_dm_disc_acl_down(bd_addr, transport);
		if (bta_dm_cb.disabling && !BTM_GetNumAclLinks()) {
		/*
		* Start a timer to make sure that the profiles

system/bta/dm/bta_dm_device_search.cc

+4 −43

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		#include <vector>

		#include "bta/dm/bta_dm_device_search_int.h"
		#include "bta/dm/bta_dm_disc_legacy.h"
		#include "common/circular_buffer.h"
		#include "common/strings.h"
		#include "device/include/interop.h"
		@@ -67,7 +66,6 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, tBT_TRANSP
		static void bta_dm_discover_name(const RawAddress& remote_bd_addr);
		static void bta_dm_execute_queued_search_request();
		static void bta_dm_search_cancel_notify();
		static void bta_dm_disable_search();

		static void bta_dm_search_sm_execute(tBTA_DM_DEV_SEARCH_EVT event,
		std::unique_ptr<tBTA_DM_SEARCH_MSG> msg);
		@@ -89,14 +87,6 @@ static void post_search_evt(tBTA_DM_DEV_SEARCH_EVT event, std::unique_ptr<tBTA_D
		}
		}

		void bta_dm_disc_disable_search() {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		log::info("no-op when flag is disabled");
		return;
		}
		bta_dm_disable_search();
		}

		/*******************************************************************************
		*
		* Function bta_dm_search_start
		@@ -559,12 +549,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) {
		* Returns bool
		*
		******************************************************************************/
		bool bta_dm_is_search_request_queued() {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		return bta_dm_disc_legacy::bta_dm_is_search_request_queued();
		}
		return bta_dm_search_cb.p_pending_search != NULL;
		}
		bool bta_dm_is_search_request_queued() { return bta_dm_search_cb.p_pending_search != NULL; }

		/*******************************************************************************
		*
		@@ -869,7 +854,7 @@ static void bta_dm_search_sm_execute(tBTA_DM_DEV_SEARCH_EVT event,
		}
		}

		static void bta_dm_disable_search(void) {
		void bta_dm_disc_disable_search(void) {
		switch (bta_dm_search_get_state()) {
		case BTA_DM_SEARCH_IDLE:
		break;
		@@ -885,19 +870,11 @@ static void bta_dm_disable_search(void) {
		}

		void bta_dm_disc_start_device_discovery(tBTA_DM_SEARCH_CBACK* p_cback) {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		bta_dm_disc_legacy::bta_dm_disc_start_device_discovery(p_cback);
		return;
		}
		bta_dm_search_sm_execute(BTA_DM_API_SEARCH_EVT, std::make_unique<tBTA_DM_SEARCH_MSG>(
		tBTA_DM_API_SEARCH{.p_cback = p_cback}));
		}

		void bta_dm_disc_stop_device_discovery() {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		bta_dm_disc_legacy::bta_dm_disc_stop_device_discovery();
		return;
		}
		bta_dm_search_sm_execute(BTA_DM_API_SEARCH_CANCEL_EVT, nullptr);
		}

		@@ -911,28 +888,12 @@ static void bta_dm_search_reset() {
		bta_dm_disc_init_search_cb(::bta_dm_search_cb);
		}

		void bta_dm_search_stop() {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		log::info("no-op when flag is disabled");
		return;
		}
		bta_dm_search_reset();
		}
		void bta_dm_search_stop() { bta_dm_search_reset(); }

		void bta_dm_disc_discover_next_device() {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		bta_dm_disc_legacy::bta_dm_disc_discover_next_device();
		return;
		}
		bta_dm_discover_next_device();
		}
		void bta_dm_disc_discover_next_device() { bta_dm_discover_next_device(); }

		#define DUMPSYS_TAG "shim::legacy::bta::dm"
		void DumpsysBtaDmSearch(int fd) {
		if (!com::android::bluetooth::flags::separate_service_and_device_discovery()) {
		log::info("no-op when flag is disabled");
		return;
		}
		auto copy = search_state_history_.Pull();
		LOG_DUMPSYS(fd, " last %zu search state transitions", copy.size());
		for (const auto& it : copy) {