Merge "Fix typos for att_protocol.cc and change comment description in gatt_main.cc" into main (f0adda3b) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/gatt/att_protocol.cc

+5 −6

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ using bluetooth::Uuid;
		using namespace bluetooth;

		/**********************************************************************
		* ATT protocl message building utility *
		* ATT protocol message building utility *
		**********************************************************************/
		/*******************************************************************************
		*
		@@ -447,11 +447,10 @@ BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, tGATT_SR_MSG* p_msg,
		* Description This function sends the server response or indication
		* message to client.
		*
		* Parameter p_tcb: pointer to the connecton control block.
		* Parameter p_tcb: pointer to the connection control block.
		* p_msg: pointer to message parameters structure.
		*
		* Returns GATT_SUCCESS if sucessfully sent; otherwise error code.
		*
		* Returns GATT_SUCCESS if successfully sent; otherwise error code.
		*
		******************************************************************************/
		tGATT_STATUS attp_send_sr_msg(tGATT_TCB& tcb, uint16_t cid, BT_HDR* p_msg) {
		@@ -558,12 +557,12 @@ tGATT_STATUS attp_send_cl_confirmation_msg(tGATT_TCB& tcb, uint16_t cid) {
		* Description This function sends the client request or confirmation
		* message to server.
		*
		* Parameter p_tcb: pointer to the connectino control block.
		* Parameter p_tcb: pointer to the connection control block.
		* p_clcb: clcb
		* op_code: message op code.
		* p_msg: pointer to message parameters structure.
		*
		* Returns GATT_SUCCESS if sucessfully sent; otherwise error code.
		* Returns GATT_SUCCESS if successfully sent; otherwise error code.
		*
		*
		******************************************************************************/

system/stack/gatt/gatt_main.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ static void gatt_le_connect_cback(uint16_t /* chan */,
		else {
		p_tcb = gatt_allocate_tcb_by_bdaddr(bd_addr, BT_TRANSPORT_LE);
		if (!p_tcb) {
		log::error("CCB max out, no rsources");
		log::error("CCB max out, no resources");
		if (com::android::bluetooth::flags::
		gatt_drop_acl_on_out_of_resources_fix()) {
		log::error("Disconnecting address:{} due to out of resources.",
		@@ -1001,7 +1001,7 @@ void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa) {
		}
		/*******************************************************************************
		*
		* Function gatt_le_data_ind
		* Function gatt_data_process
		*
		* Description This function is called when data is received from L2CAP.
		* if we are the originator of the connection, we are the ATT
		@@ -1065,7 +1065,7 @@ void gatt_add_a_bonded_dev_for_srv_chg(const RawAddress& bda) {
		NULL);
		}

		/** This function is called to send a service chnaged indication to the
		/** This function is called to send a service changed indication to the
		* specified bd address */
		void gatt_send_srv_chg_ind(const RawAddress& peer_bda) {
		static const uint16_t sGATT_DEFAULT_START_HANDLE =
		@@ -1097,7 +1097,7 @@ void gatt_send_srv_chg_ind(const RawAddress& peer_bda) {
		}
		}

		/** Check sending service chnaged Indication is required or not if required then
		/** Check sending service changed Indication is required or not if required then
		* send the Indication */
		void gatt_chk_srv_chg(tGATTS_SRV_CHG* p_srv_chg_clt) {
		log::verbose("srv_changed={}", p_srv_chg_clt->srv_changed);