Snap for 7351654 from 376a979c612c4f3e2d96afe673cea8097c604e98 to sc-release (69414610) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_act.cc

+8 −5

Original line number	Diff line number	Diff line
		@@ -877,7 +877,8 @@ void bta_gattc_confirm(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
		}

		/** read complete */
		void bta_gattc_read_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		static void bta_gattc_read_cmpl(tBTA_GATTC_CLCB* p_clcb,
		tBTA_GATTC_OP_CMPL* p_data) {
		GATT_READ_OP_CB cb = p_clcb->p_q_cmd->api_read.read_cb;
		void* my_cb_data = p_clcb->p_q_cmd->api_read.read_cb_data;

		@@ -897,7 +898,8 @@ void bta_gattc_read_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		}

		/** write complete */
		void bta_gattc_write_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		static void bta_gattc_write_cmpl(tBTA_GATTC_CLCB* p_clcb,
		tBTA_GATTC_OP_CMPL* p_data) {
		GATT_WRITE_OP_CB cb = p_clcb->p_q_cmd->api_write.write_cb;
		void* my_cb_data = p_clcb->p_q_cmd->api_write.write_cb_data;

		@@ -910,7 +912,8 @@ void bta_gattc_write_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		}

		/** execute write complete */
		void bta_gattc_exec_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		static void bta_gattc_exec_cmpl(tBTA_GATTC_CLCB* p_clcb,
		tBTA_GATTC_OP_CMPL* p_data) {
		tBTA_GATTC cb_data;

		osi_free_and_reset((void**)&p_clcb->p_q_cmd);
		@@ -924,7 +927,7 @@ void bta_gattc_exec_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_OP_CMPL* p_data) {
		}

		/** configure MTU operation complete */
		void bta_gattc_cfg_mtu_cmpl(tBTA_GATTC_CLCB* p_clcb,
		static void bta_gattc_cfg_mtu_cmpl(tBTA_GATTC_CLCB* p_clcb,
		tBTA_GATTC_OP_CMPL* p_data) {
		GATT_CONFIGURE_MTU_OP_CB cb = p_clcb->p_q_cmd->api_mtu.mtu_cb;
		void* my_cb_data = p_clcb->p_q_cmd->api_mtu.mtu_cb_data;

system/bta/include/bta_gatt_api.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -119,13 +119,9 @@ typedef struct {
		uint8_t* p_value;
		} tBTA_GATT_UNFMT;

		typedef uint16_t tBTA_GATT_REASON;

		#define BTA_GATTC_MULTI_MAX GATT_MAX_READ_MULTI_HANDLES

		typedef struct {
		uint8_t num_attr;
		uint16_t handles[BTA_GATTC_MULTI_MAX];
		uint16_t handles[GATT_MAX_READ_MULTI_HANDLES];
		} tBTA_GATTC_MULTI;

		/* callback data structure */

system/stack/gatt/gatt_attr.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -572,7 +572,8 @@ static void gatt_cl_op_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
		tGATT_CL_COMPLETE* p_data) {
		auto iter = OngoingOps.find(conn_id);

		VLOG(1) << __func__ << " opcode: " << loghex(op) << " status: " << status
		VLOG(1) << __func__ << " opcode: " << loghex(static_cast<uint8_t>(op))
		<< " status: " << status
		<< " conn id: " << loghex(static_cast<uint8_t>(conn_id));

		if (op != GATTC_OPTYPE_READ) return;

system/stack/gatt/gatt_cl.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -626,7 +626,7 @@ void gatt_process_notification(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code,
		tGATT_STATUS encrypt_status;
		uint8_t* p = p_data;
		uint8_t i;
		uint8_t event = (op_code == GATT_HANDLE_VALUE_IND)
		tGATTC_OPTYPE event = (op_code == GATT_HANDLE_VALUE_IND)
		? GATTC_OPTYPE_INDICATION
		: GATTC_OPTYPE_NOTIFICATION;

system/stack/gatt/gatt_int.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ struct tGATT_CLCB {
		uint16_t counter; /* used as offset, attribute length, num of prepare write */
		uint16_t start_offset;
		tGATT_AUTH_REQ auth_req; /* authentication requirement */
		uint8_t operation; /* one logic channel can have one operation active */
		tGATTC_OPTYPE operation; /* one logic channel can have one operation active */
		uint8_t op_subtype; /* operation subtype */
		tGATT_STATUS status; /* operation status */
		bool first_read_blob_after_read;