Discover primary service by UUID for PTS tests (1/4) am: 8ce750366a (52d88f28) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_api.cc

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -255,6 +255,16 @@ void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, tBT_UUID* p_srvc_uuid) {
	bta_sys_sendmsg(p_buf);		bta_sys_sendmsg(p_buf);
	}		}

			void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id, tBT_UUID* p_srvc_uuid) {
			tGATT_DISC_PARAM* param = new tGATT_DISC_PARAM;
			param->s_handle = 0x0001;
			param->e_handle = 0xFFFF;
			param->service = *p_srvc_uuid;
			do_in_bta_thread(FROM_HERE,
			base::Bind(base::IgnoreResult(&GATTC_Discover), conn_id,
			GATT_DISC_SRVC_BY_UUID, base::Owned(param)));
			}

	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function BTA_GATTC_GetServices		* Function BTA_GATTC_GetServices

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -693,6 +693,13 @@ extern void BTA_GATTC_Close(uint16_t conn_id);
	extern void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id,		extern void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id,
	tBT_UUID* p_srvc_uuid);		tBT_UUID* p_srvc_uuid);

			/**
			* This function is called to send "Find service by UUID" request. Used only for
			* PTS tests.
			*/
			extern void BTA_GATTC_DiscoverServiceByUuid(uint16_t conn_id,
			tBT_UUID* p_srvc_uuid);

	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function BTA_GATTC_GetServices		* Function BTA_GATTC_GetServices

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -368,6 +368,15 @@ bt_status_t btif_gattc_search_service(int conn_id, bt_uuid_t* filter_uuid) {
	}		}
	}		}

			void btif_gattc_discover_service_by_uuid(int conn_id, bt_uuid_t* p_uuid) {
			LOG_ASSERT(p_uuid);

			tBT_UUID* uuid = new tBT_UUID;
			btif_to_bta_uuid(uuid, p_uuid);
			do_in_jni_thread(
			Bind(&BTA_GATTC_DiscoverServiceByUuid, conn_id, base::Owned(uuid)));
			}

	void btif_gattc_get_gatt_db_impl(int conn_id) {		void btif_gattc_get_gatt_db_impl(int conn_id) {
	btgatt_db_element_t* db = NULL;		btgatt_db_element_t* db = NULL;
	int count = 0;		int count = 0;
	@@ -609,6 +618,7 @@ const btgatt_client_interface_t btgattClientInterface = {
	btif_gattc_close,		btif_gattc_close,
	btif_gattc_refresh,		btif_gattc_refresh,
	btif_gattc_search_service,		btif_gattc_search_service,
			btif_gattc_discover_service_by_uuid,
	btif_gattc_read_char,		btif_gattc_read_char,
	btif_gattc_read_using_char_uuid,		btif_gattc_read_using_char_uuid,
	btif_gattc_write_char,		btif_gattc_write_char,

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,7 @@ btgatt_client_interface_t fake_btgattc_iface = {
	FakeDisconnect,		FakeDisconnect,
	nullptr, // refresh		nullptr, // refresh
	nullptr, // search_service		nullptr, // search_service
			nullptr, // discover_service_by_uuid
	nullptr, // read_characteristic		nullptr, // read_characteristic
	nullptr, // read_using_characteristic_uuid		nullptr, // read_using_characteristic_uuid
	nullptr, // write_characteristic		nullptr, // write_characteristic