Merge "Remove usage of base::Owned in btif_gattc_search_service" into main (c03cb30e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/csis/csis_client.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -862,7 +862,7 @@ class CsisClientImpl : public CsisClient {
		if (device->is_gatt_service_valid) {
		NotifyCsisDeviceValidAndStoreIfNeeded(device);
		} else {
		BTA_GATTC_ServiceSearchRequest(device->conn_id, &kCsisServiceUuid);
		BTA_GATTC_ServiceSearchRequest(device->conn_id, kCsisServiceUuid);
		}
		}

		@@ -2135,7 +2135,7 @@ class CsisClientImpl : public CsisClient {
		if (device->is_gatt_service_valid) {
		instance->OnEncrypted(device);
		} else {
		BTA_GATTC_ServiceSearchRequest(device->conn_id, &kCsisServiceUuid);
		BTA_GATTC_ServiceSearchRequest(device->conn_id, kCsisServiceUuid);
		}
		}

		@@ -2151,7 +2151,7 @@ class CsisClientImpl : public CsisClient {
		BtaGattQueue::Clean(device->conn_id);
		DeregisterNotifications(device);
		device->ClearSvcData();
		BTA_GATTC_ServiceSearchRequest(device->conn_id, &kCsisServiceUuid);
		BTA_GATTC_ServiceSearchRequest(device->conn_id, kCsisServiceUuid);
		}

		void OnGattServiceChangeEvent(const RawAddress& address) {
		@@ -2175,7 +2175,7 @@ class CsisClientImpl : public CsisClient {
		log::debug("address={}", address);

		if (!device->is_gatt_service_valid)
		BTA_GATTC_ServiceSearchRequest(device->conn_id, &kCsisServiceUuid);
		BTA_GATTC_ServiceSearchRequest(device->conn_id, kCsisServiceUuid);
		}

		static uint16_t FindCccHandle(uint16_t conn_id, uint16_t char_handle) {

system/bta/dm/bta_dm_disc.cc

+5 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,11 @@ struct gatt_interface_t {
		.BTA_GATTC_Close = [](uint16_t conn_id) { BTA_GATTC_Close(conn_id); },
		.BTA_GATTC_ServiceSearchRequest =
		[](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {
		BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);
		if (p_srvc_uuid) {
		BTA_GATTC_ServiceSearchRequest(conn_id, *p_srvc_uuid);
		} else {
		BTA_GATTC_ServiceSearchAllRequest(conn_id);
		}
		},
		.BTA_GATTC_Open =
		[](tGATT_IF client_if, const RawAddress& remote_bda,

system/bta/dm/bta_dm_disc_legacy.cc

+5 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,11 @@ struct gatt_interface_t {
		[](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s conn_id:%hu", "GATTC_ServiceSearchRequest", conn_id));
		BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);
		if (p_srvc_uuid) {
		BTA_GATTC_ServiceSearchRequest(conn_id, *p_srvc_uuid);
		} else {
		BTA_GATTC_ServiceSearchAllRequest(conn_id);
		}
		},
		.BTA_GATTC_Open =
		[](tGATT_IF client_if, const RawAddress& remote_bda,

system/bta/dm/bta_dm_gatt_client.cc

+5 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,11 @@ gatt_interface_t default_gatt_interface = {
		[](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {
		gatt_history_.Push(base::StringPrintf(
		"%-32s conn_id:%hu", "GATTC_ServiceSearchRequest", conn_id));
		BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);
		if (p_srvc_uuid) {
		BTA_GATTC_ServiceSearchRequest(conn_id, *p_srvc_uuid);
		} else {
		BTA_GATTC_ServiceSearchAllRequest(conn_id);
		}
		},
		.BTA_GATTC_Open =
		[](tGATT_IF client_if, const RawAddress& remote_bda,

system/bta/gatt/bta_gattc_api.cc

+14 −24

Original line number	Diff line number	Diff line
		@@ -255,36 +255,26 @@ void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu,
		bta_sys_sendmsg(p_buf);
		}

		/*******************************************************************************
		*
		* Function BTA_GATTC_ServiceSearchRequest
		*
		* Description This function is called to request a GATT service discovery
		* on a GATT server. This function report service search
		* result by a callback event, and followed by a service search
		* complete event.
		*
		* Parameters conn_id: connection ID.
		* p_srvc_uuid: a UUID of the service application is interested
		* in.
		* If Null, discover for all services.
		*
		* Returns None
		*
		******************************************************************************/
		void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, const Uuid* p_srvc_uuid) {
		const size_t len = sizeof(tBTA_GATTC_API_SEARCH) + sizeof(Uuid);
		void BTA_GATTC_ServiceSearchAllRequest(uint16_t conn_id) {
		const size_t len = sizeof(tBTA_GATTC_API_SEARCH);
		tBTA_GATTC_API_SEARCH* p_buf = (tBTA_GATTC_API_SEARCH*)osi_calloc(len);

		p_buf->hdr.event = BTA_GATTC_API_SEARCH_EVT;
		p_buf->hdr.layer_specific = conn_id;
		if (p_srvc_uuid) {
		p_buf->p_srvc_uuid = (Uuid*)(p_buf + 1);
		p_buf->p_srvc_uuid = p_srvc_uuid;
		} else {
		p_buf->p_srvc_uuid = NULL;

		bta_sys_sendmsg(p_buf);
		}

		void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, Uuid p_srvc_uuid) {
		const size_t len = sizeof(tBTA_GATTC_API_SEARCH) + sizeof(Uuid);
		tBTA_GATTC_API_SEARCH* p_buf = (tBTA_GATTC_API_SEARCH*)osi_calloc(len);

		p_buf->hdr.event = BTA_GATTC_API_SEARCH_EVT;
		p_buf->hdr.layer_specific = conn_id;
		p_buf->p_srvc_uuid = (Uuid*)(p_buf + 1);
		*p_buf->p_srvc_uuid = p_srvc_uuid;

		bta_sys_sendmsg(p_buf);
		}