Merge "Remove unused messages" into main (d89102b9) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_device_search_int.h

+1 −9

Original line number	Diff line number	Diff line
		@@ -51,22 +51,14 @@ typedef struct {
		tBTA_DM_SEARCH_CBACK* p_cback;
		} tBTA_DM_API_SEARCH;

		typedef struct {
		} tBTA_DM_API_DISCOVERY_CANCEL;

		typedef struct {
		RawAddress bd_addr;
		BD_NAME bd_name; /* Name of peer device. */
		tHCI_STATUS hci_status;
		} tBTA_DM_REMOTE_NAME;

		/* data type for tBTA_DM_DISC_RESULT */
		typedef struct {
		tBTA_DM_SEARCH result;
		} tBTA_DM_DISC_RESULT;

		using tBTA_DM_SEARCH_MSG =
		std::variant<tBTA_DM_API_SEARCH, tBTA_DM_REMOTE_NAME, tBTA_DM_DISC_RESULT>;
		std::variant<tBTA_DM_API_SEARCH, tBTA_DM_REMOTE_NAME>;

		/* DM search state */
		typedef enum {

+2 −10

Original line number	Diff line number	Diff line
		@@ -56,14 +56,6 @@ typedef struct {
		tBT_TRANSPORT transport;
		} tBTA_DM_API_DISCOVER;

		typedef struct {
		} tBTA_DM_API_DISCOVERY_CANCEL;

		/* data type for tBTA_DM_DISC_RESULT */
		typedef struct {
		tBTA_DM_SEARCH result;
		} tBTA_DM_DISC_RESULT;

		/* data type for BTA_DM_SDP_RESULT_EVT */
		typedef struct {
		tSDP_RESULT sdp_result;
		@@ -78,8 +70,8 @@ typedef struct {
		tHCI_STATUS hci_status;
		} tBTA_DM_SVC_RES;

		using tBTA_DM_MSG = std::variant<tBTA_DM_API_DISCOVER, tBTA_DM_DISC_RESULT,
		tBTA_DM_SDP_RESULT, tBTA_DM_SVC_RES>;
		using tBTA_DM_MSG =
		std::variant<tBTA_DM_API_DISCOVER, tBTA_DM_SDP_RESULT, tBTA_DM_SVC_RES>;

		typedef enum {
		BTA_DM_DISCOVER_IDLE,