Merge changes from topic 'bug-27455533-to-nyc-dev-merge-1' into nyc-dev (72d12524) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ LOCAL_SRC_FILES:= \
		./gatt/bta_gatts_act.c \
		./gatt/bta_gatts_main.c \
		./gatt/bta_gattc_utils.c \
		./gatt/bta_gattc_ci.c \
		./gatt/bta_gatts_api.c \
		./gatt/bta_gattc_main.c \
		./gatt/bta_gattc_act.c \

system/bta/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ static_library("bta") {
		"gatt/bta_gattc_act.c",
		"gatt/bta_gattc_api.c",
		"gatt/bta_gattc_cache.c",
		"gatt/bta_gattc_ci.c",
		"gatt/bta_gattc_main.c",
		"gatt/bta_gattc_utils.c",
		"gatt/bta_gatts_act.c",

system/bta/gatt/bta_gattc_act.c

+67 −229

Original line number	Diff line number	Diff line
		@@ -97,6 +97,9 @@ static const char *bta_gattc_op_code_name[] =
		** Action Functions
		*****************************************************************************/


		void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS status);

		/*******************************************************************************
		**
		** Function bta_gattc_enable
		@@ -711,7 +714,13 @@ void bta_gattc_conn(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		if (p_clcb->p_srcb->state == BTA_GATTC_SERV_IDLE)
		{
		p_clcb->p_srcb->state = BTA_GATTC_SERV_LOAD;
		bta_gattc_sm_execute(p_clcb, BTA_GATTC_START_CACHE_EVT, NULL);
		if (bta_gattc_cache_load(p_clcb)) {
		bta_gattc_reset_discover_st(p_clcb->p_srcb, BTA_GATT_OK);
		} else {
		p_clcb->p_srcb->state = BTA_GATTC_SERV_DISC;
		/* cache load failure, start discovery */
		bta_gattc_start_discover(p_clcb, NULL);
		}
		}
		else /* cache is building */
		p_clcb->state = BTA_GATTC_DISCOVER_ST;
		@@ -1035,7 +1044,7 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		}

		/* used to reset cache in application */
		bta_gattc_co_cache_reset(p_clcb->p_srcb->server_bda);
		bta_gattc_cache_reset(p_clcb->p_srcb->server_bda);
		}
		if (p_clcb->p_srcb && p_clcb->p_srcb->p_srvc_list) {
		/* release pending attribute list buffer */
		@@ -1074,28 +1083,24 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		*******************************************************************************/
		void bta_gattc_read(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		if (!bta_gattc_enqueue(p_clcb, p_data))
		return;

		UINT16 handle = 0;
		tGATT_READ_PARAM read_param;
		tBTA_GATT_STATUS status;

		memset (&read_param, 0 ,sizeof(tGATT_READ_PARAM));

		if (bta_gattc_enqueue(p_clcb, p_data))
		{
		if ((handle = bta_gattc_id2handle(p_clcb->p_srcb,
		&p_data->api_read.srvc_id,
		&p_data->api_read.char_id,
		p_data->api_read.p_descr_type)) == 0)
		{
		status = BTA_GATT_ERROR;
		}
		if (p_data->api_write.p_descr_type == NULL)
		handle = p_data->api_write.char_id.inst_id;
		else
		{
		handle = p_data->api_write.p_descr_type->inst_id;

		read_param.by_handle.handle = handle;
		read_param.by_handle.auth_req = p_data->api_read.auth_req;

		status = GATTC_Read(p_clcb->bta_conn_id, GATT_READ_BY_HANDLE, &read_param);
		}

		/* read fail */
		if (status != BTA_GATT_OK)
		@@ -1107,7 +1112,6 @@ void bta_gattc_read(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		bta_gattc_cmpl_sendmsg(p_clcb->bta_conn_id, GATTC_OPTYPE_READ, status, NULL);
		}
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_read_multi
		@@ -1133,22 +1137,11 @@ void bta_gattc_read_multi(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		handle = 0;

		if (p_id->id_type == BTA_GATT_TYPE_CHAR)
		{
		handle = bta_gattc_id2handle(p_clcb->p_srcb,
		&p_id->id_value.char_id.srvc_id,
		&p_id->id_value.char_id.char_id,
		NULL);
		}
		else if (p_id->id_type == BTA_GATT_TYPE_CHAR_DESCR)
		{
		handle = bta_gattc_id2handle(p_clcb->p_srcb,
		&p_id->id_value.char_descr_id.char_id.srvc_id,
		&p_id->id_value.char_descr_id.char_id.char_id,
		&p_id->id_value.char_descr_id.descr_id);
		}
		else
		{
		if (p_id->id_type == BTA_GATT_TYPE_CHAR) {
		handle = p_id->id_value.char_id.char_id.inst_id;
		} else if (p_id->id_type == BTA_GATT_TYPE_CHAR_DESCR) {
		handle = p_id->id_value.char_descr_id.descr_id.inst_id;
		} else {
		APPL_TRACE_ERROR("invalud ID type: %d", p_id->id_type);
		}

		@@ -1188,20 +1181,17 @@ void bta_gattc_read_multi(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		*******************************************************************************/
		void bta_gattc_write(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		if (!bta_gattc_enqueue(p_clcb, p_data))
		return;

		UINT16 handle = 0;
		tBTA_GATT_STATUS status = BTA_GATT_OK;

		if (bta_gattc_enqueue(p_clcb, p_data))
		{
		if ((handle = bta_gattc_id2handle(p_clcb->p_srcb,
		&p_data->api_write.srvc_id,
		&p_data->api_write.char_id,
		p_data->api_write.p_descr_type)) == 0)
		{
		status = BTA_GATT_ERROR;
		}
		if (p_data->api_write.p_descr_type == NULL)
		handle = p_data->api_write.char_id.inst_id;
		else
		{
		handle = p_data->api_write.p_descr_type->inst_id;

		tGATT_VALUE attr;

		attr.conn_id = p_clcb->bta_conn_id;
		@@ -1214,7 +1204,6 @@ void bta_gattc_write(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		memcpy(attr.value, p_data->api_write.p_value, p_data->api_write.len);

		status = GATTC_Write(p_clcb->bta_conn_id, p_data->api_write.write_type, &attr);
		}

		/* write fail */
		if (status != BTA_GATT_OK)
		@@ -1226,7 +1215,6 @@ void bta_gattc_write(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		bta_gattc_cmpl_sendmsg(p_clcb->bta_conn_id, GATTC_OPTYPE_WRITE, status, NULL);
		}
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_execute
		@@ -1264,33 +1252,19 @@ void bta_gattc_execute(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		*******************************************************************************/
		void bta_gattc_confirm(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		UINT16 handle;
		UINT16 handle = p_data->api_confirm.char_id.inst_id;

		if ((handle = bta_gattc_id2handle(p_clcb->p_srcb,
		&p_data->api_confirm.srvc_id,
		&p_data->api_confirm.char_id,
		NULL)) == 0)
		{
		APPL_TRACE_ERROR("Can not map service/char ID into valid handle");
		}
		else
		{
		if (GATTC_SendHandleValueConfirm(p_data->api_confirm.hdr.layer_specific, handle)
		!= GATT_SUCCESS)
		{
		!= GATT_SUCCESS) {
		APPL_TRACE_ERROR("bta_gattc_confirm to handle [0x%04x] failed", handle);
		}
		else
		{
		} else {
		/* if over BR_EDR, inform PM for mode change */
		if (p_clcb->transport == BTA_TRANSPORT_BR_EDR)
		{
		if (p_clcb->transport == BTA_TRANSPORT_BR_EDR) {
		bta_sys_busy(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
		bta_sys_idle(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
		}
		}
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_read_cmpl
		@@ -1582,143 +1556,7 @@ void bta_gattc_q_cmd(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		bta_gattc_enqueue(p_clcb, p_data);
		}
		/*******************************************************************************
		**
		** Function bta_gattc_cache_open
		**
		** Description open a NV cache for loading
		**
		** Returns void
		**
		*******************************************************************************/
		void bta_gattc_cache_open(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		UNUSED(p_data);

		bta_gattc_set_discover_st(p_clcb->p_srcb);

		APPL_TRACE_DEBUG("bta_gattc_cache_open conn_id=%d",p_clcb->bta_conn_id);
		bta_gattc_co_cache_open(p_clcb->p_srcb->server_bda, BTA_GATTC_CI_CACHE_OPEN_EVT,
		p_clcb->bta_conn_id, FALSE);
		}
		/*******************************************************************************
		**
		** Function bta_gattc_start_load
		**
		** Description start cache loading by sending callout open cache
		**
		** Returns None.
		**
		*******************************************************************************/
		void bta_gattc_ci_open(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		APPL_TRACE_DEBUG("bta_gattc_ci_open conn_id=%d server state=%d" ,
		p_clcb->bta_conn_id, p_clcb->p_srcb->state);
		if (p_clcb->p_srcb->state == BTA_GATTC_SERV_LOAD)
		{
		if (p_data->ci_open.status == BTA_GATT_OK)
		{
		p_clcb->p_srcb->attr_index = 0;
		bta_gattc_co_cache_load(p_clcb->p_srcb->server_bda,
		BTA_GATTC_CI_CACHE_LOAD_EVT,
		p_clcb->p_srcb->attr_index,
		p_clcb->bta_conn_id);
		}
		else
		{
		p_clcb->p_srcb->state = BTA_GATTC_SERV_DISC;
		/* cache open failure, start discovery */
		bta_gattc_start_discover(p_clcb, NULL);
		}
		}
		if (p_clcb->p_srcb->state == BTA_GATTC_SERV_SAVE)
		{
		if (p_data->ci_open.status == BTA_GATT_OK)
		{
		if (!bta_gattc_cache_save(p_clcb->p_srcb, p_clcb->bta_conn_id))
		{
		p_data->ci_open.status = BTA_GATT_ERROR;
		}
		}
		if (p_data->ci_open.status != BTA_GATT_OK)
		{
		p_clcb->p_srcb->attr_index = 0;
		bta_gattc_co_cache_close(p_clcb->p_srcb->server_bda, p_clcb->bta_conn_id);
		bta_gattc_reset_discover_st(p_clcb->p_srcb, p_clcb->status);

		}
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_ci_load
		**
		** Description cache loading received.
		**
		** Returns None.
		**
		*******************************************************************************/
		void bta_gattc_ci_load(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{

		APPL_TRACE_DEBUG("bta_gattc_ci_load conn_id=%d load status=%d",
		p_clcb->bta_conn_id, p_data->ci_load.status);

		if (p_data->ci_load.status == BTA_GATT_OK \|\|
		p_data->ci_load.status == BTA_GATT_MORE)
		{
		if (p_data->ci_load.num_attr != 0)
		bta_gattc_rebuild_cache(p_clcb->p_srcb, p_data->ci_load.num_attr,
		p_data->ci_load.attr, p_clcb->p_srcb->attr_index);

		if (p_data->ci_load.status == BTA_GATT_OK)
		{
		p_clcb->p_srcb->attr_index = 0;
		bta_gattc_reset_discover_st(p_clcb->p_srcb, BTA_GATT_OK);
		bta_gattc_co_cache_close(p_clcb->p_srcb->server_bda, 0);
		}
		else /* load more */
		{
		p_clcb->p_srcb->attr_index += p_data->ci_load.num_attr;

		bta_gattc_co_cache_load(p_clcb->p_srcb->server_bda,
		BTA_GATTC_CI_CACHE_LOAD_EVT,
		p_clcb->p_srcb->attr_index,
		p_clcb->bta_conn_id);
		}
		}
		else
		{
		bta_gattc_co_cache_close(p_clcb->p_srcb->server_bda, 0);
		p_clcb->p_srcb->state = BTA_GATTC_SERV_DISC;
		p_clcb->p_srcb->attr_index = 0;
		/* cache load failure, start discovery */
		bta_gattc_start_discover(p_clcb, NULL);
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_ci_save
		**
		** Description cache loading received.
		**
		** Returns None.
		**
		*******************************************************************************/
		void bta_gattc_ci_save(tBTA_GATTC_CLCB p_clcb, tBTA_GATTC_DATA p_data)
		{
		UNUSED(p_data);

		APPL_TRACE_DEBUG("bta_gattc_ci_save conn_id=%d " ,
		p_clcb->bta_conn_id );

		if (!bta_gattc_cache_save(p_clcb->p_srcb, p_clcb->bta_conn_id))
		{
		p_clcb->p_srcb->attr_index = 0;
		bta_gattc_co_cache_close(p_clcb->p_srcb->server_bda, 0);
		bta_gattc_reset_discover_st(p_clcb->p_srcb, p_clcb->status);
		}
		}
		/*******************************************************************************
		**
		** Function bta_gattc_fail
		@@ -1893,7 +1731,7 @@ void bta_gattc_process_api_refresh(tBTA_GATTC_CB p_cb, tBTA_GATTC_DATA p_msg)
		}
		}
		/* used to reset cache in application */
		bta_gattc_co_cache_reset(p_msg->api_conn.remote_bda);
		bta_gattc_cache_reset(p_msg->api_conn.remote_bda);

		}
		/*******************************************************************************

system/bta/gatt/bta_gattc_api.c

+2 −87

Original line number	Diff line number	Diff line
		@@ -382,51 +382,6 @@ tBTA_GATT_STATUS BTA_GATTC_GetFirstCharDescr (UINT16 conn_id, tBTA_GATTC_CHAR_I
		return status;

		}
		/*******************************************************************************
		**
		** Function BTA_GATTC_GetNextCharDescr
		**
		** Description This function is called to find the next characteristic descriptor
		** of the characterisctic.
		**
		** Parameters conn_id: connection ID which identify the server.
		** p_start_descr_id: start the descriptor search from the next record
		** after the one identified by p_start_descr_id.
		** p_descr_uuid_cond: Characteristic descriptor UUID, if NULL find
		** the first available characteristic descriptor.
		** p_descr_result: output parameter which will store the GATT
		** characteristic descriptor ID.
		**
		** Returns returns status.
		**
		*******************************************************************************/
		tBTA_GATT_STATUS BTA_GATTC_GetNextCharDescr (UINT16 conn_id,
		tBTA_GATTC_CHAR_DESCR_ID *p_start_descr_id,
		tBT_UUID *p_descr_uuid_cond,
		tBTA_GATTC_CHAR_DESCR_ID *p_descr_result)
		{
		tBTA_GATT_STATUS status;

		if (!p_start_descr_id \|\| !p_descr_result)
		return BTA_GATT_ILLEGAL_PARAMETER;

		memset(p_descr_result, 0, sizeof(tBTA_GATTC_CHAR_DESCR_ID));

		if ((status = bta_gattc_query_cache(conn_id, BTA_GATTC_ATTR_TYPE_CHAR_DESCR,
		&p_start_descr_id->char_id.srvc_id,
		&p_start_descr_id->char_id.char_id,
		p_descr_uuid_cond,
		&p_descr_result->char_id.char_id,
		(void *)&p_start_descr_id->descr_id))
		== BTA_GATT_OK)
		{
		memcpy(&p_descr_result->descr_id, &p_descr_result->char_id.char_id, sizeof(tBTA_GATT_ID));
		memcpy(&p_descr_result->char_id, p_start_descr_id, sizeof(tBTA_GATTC_CHAR_ID));
		}

		return status;
		}


		/*******************************************************************************
		**
		@@ -467,48 +422,6 @@ tBTA_GATT_STATUS BTA_GATTC_GetFirstIncludedService(UINT16 conn_id, tBTA_GATT_SR

		return status;
		}
		/*******************************************************************************
		**
		** Function BTA_GATTC_GetNextIncludedService
		**
		** Description This function is called to find the next included service of the
		** service on the given server.
		**
		** Parameters conn_id: connection ID which identify the server.
		** p_start_id: start the search from the next record
		** after the one identified by p_start_id.
		** p_uuid_cond: Included service UUID, if NULL find the first available
		** included service.
		** p_result: output parameter which will store the GATT ID
		** of the included service found.
		**
		** Returns returns status.
		**
		*******************************************************************************/
		tBTA_GATT_STATUS BTA_GATTC_GetNextIncludedService(UINT16 conn_id,
		tBTA_GATTC_INCL_SVC_ID *p_start_id,
		tBT_UUID *p_uuid_cond,
		tBTA_GATTC_INCL_SVC_ID *p_result)
		{
		tBTA_GATT_STATUS status;

		if (!p_start_id \|\| !p_result)
		return BTA_GATT_ILLEGAL_PARAMETER;

		if ((status = bta_gattc_query_cache(conn_id,
		BTA_GATTC_ATTR_TYPE_INCL_SRVC,
		&p_start_id->srvc_id,
		&p_start_id->incl_svc_id.id,
		p_uuid_cond,
		&p_result->incl_svc_id.id,
		(void *)&p_result->incl_svc_id.is_primary))
		== BTA_GATT_OK)
		{
		memcpy(&p_result->srvc_id, &p_start_id->srvc_id, sizeof(tBTA_GATT_SRVC_ID));
		}

		return status;
		}

		/*******************************************************************************
		**
		@@ -658,6 +571,7 @@ void BTA_GATTC_WriteCharValue ( UINT16 conn_id,

		memcpy(&p_buf->srvc_id, &p_char_id->srvc_id, sizeof(tBTA_GATT_SRVC_ID));
		memcpy(&p_buf->char_id, &p_char_id->char_id, sizeof(tBTA_GATT_ID));
		p_buf->p_descr_type = NULL;

		p_buf->write_type = write_type;
		p_buf->len = len;
		@@ -744,6 +658,7 @@ void BTA_GATTC_PrepareWrite (UINT16 conn_id, tBTA_GATTC_CHAR_ID *p_char_id,

		memcpy(&p_buf->srvc_id, &p_char_id->srvc_id, sizeof(tBTA_GATT_SRVC_ID));
		memcpy(&p_buf->char_id, &p_char_id->char_id, sizeof(tBTA_GATT_ID));
		p_buf->p_descr_type = NULL;

		p_buf->write_type = BTA_GATTC_WRITE_PREPARE;
		p_buf->offset = offset;

system/bta/gatt/bta_gattc_cache.c

+244 −318

File changed.

Preview size limit exceeded, changes collapsed.