Merge "Run clang format on files touched by CL 488398" (257bc1de) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/jv/bta_jv_act.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -1195,7 +1195,8 @@ void bta_jv_l2cap_start_server(tBTA_JV_MSG* p_data) {

		sec_id = bta_jv_alloc_sec_id();
		/* PSM checking is not required for LE COC */
		if (0 == sec_id \|\| ((ls->type == BTA_JV_CONN_TYPE_L2CAP) &&
		if (0 == sec_id \|\|
		((ls->type == BTA_JV_CONN_TYPE_L2CAP) &&
		(false == bta_jv_check_psm(ls->local_psm))) \|\|
		(handle = GAP_ConnOpen("JV L2CAP", sec_id, 1, nullptr, ls->local_psm,
		&cfg, ertm_info, ls->sec_mask, chan_mode_mask,

system/stack/avct/avct_bcb_act.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		*
		* Name: avct_bcb_act.cc
		*
		* Description: This module contains action functions of the browsing control
		* state machine.
		* Description: This module contains action functions of the browsing
		* control state machine.
		*
		*****************************************************************************/

system/stack/avrc/avrc_api.cc

+12 −13

Original line number	Diff line number	Diff line
		@@ -266,8 +266,7 @@ static void avrc_prep_end_frag(uint8_t handle) {
		p_fcb = &avrc_cb.fcb[handle];

		/* The response type of the end fragment should be the same as the the PDU of
		*"End Fragment
		** Response" Errata:
		* "End Fragment Response" Errata:
		* https://www.bluetooth.org/errata/errata_view.cfm?errata_id=4383
		*/
		p_orig_data = ((uint8_t*)(p_fcb->p_fmsg + 1) + p_fcb->p_fmsg->offset);

system/stack/btm/btm_sec.cc

+13 −11

Original line number	Diff line number	Diff line
		@@ -1239,7 +1239,8 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr,
		tBTM_STATUS rc = 0;

		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
		if (!p_dev_rec \|\| (transport == BT_TRANSPORT_BR_EDR &&
		if (!p_dev_rec \|\|
		(transport == BT_TRANSPORT_BR_EDR &&
		p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE) \|\|
		(transport == BT_TRANSPORT_LE &&
		p_dev_rec->ble_hci_handle == BTM_SEC_INVALID_HANDLE)) {
		@@ -2140,7 +2141,8 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm,
		* The layer above L2CAP needs to carry out the security requirement after
		* L2CAP connect
		* response is received */
		if (is_originator && ((btm_cb.security_mode == BTM_SEC_MODE_UNDEFINED \|\|
		if (is_originator &&
		((btm_cb.security_mode == BTM_SEC_MODE_UNDEFINED \|\|
		btm_cb.security_mode == BTM_SEC_MODE_NONE \|\|
		btm_cb.security_mode == BTM_SEC_MODE_SERVICE \|\|
		btm_cb.security_mode == BTM_SEC_MODE_LINK) \|\|
		@@ -2767,8 +2769,7 @@ static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec) {
		}

		/* Make sure an L2cap link control block is available */
		if (!p_lcb &&
		(p_lcb = l2cu_allocate_lcb(p_dev_rec->bd_addr, true,
		if (!p_lcb && (p_lcb = l2cu_allocate_lcb(p_dev_rec->bd_addr, true,
		BT_TRANSPORT_BR_EDR)) == NULL) {
		LOG(WARNING) << "Security Manager: failed allocate LCB "
		<< p_dev_rec->bd_addr;
		@@ -4882,7 +4883,8 @@ void btm_sec_pin_code_request(const RawAddress& p_bda) {
		/* If pairing disabled OR (no PIN callback and not bonding) */
		/* OR we could not allocate entry in the database reject pairing request */
		else if (
		p_cb->pairing_disabled \|\| (p_cb->api.p_pin_callback == NULL)
		p_cb->pairing_disabled \|\|
		(p_cb->api.p_pin_callback == NULL)

		/* OR Microsoft keyboard can for some reason try to establish connection
		*/

system/stack/gatt/gatt_cl.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -591,8 +591,9 @@ void gatt_process_notification(tGATT_TCB& tcb, uint8_t op_code, uint16_t len,
		tGATT_REG* p_reg;
		uint16_t conn_id;
		tGATT_STATUS encrypt_status;
		uint8_t *p = p_data, i,
		event = (op_code == GATT_HANDLE_VALUE_NOTIF)
		uint8_t* p = p_data;
		uint8_t i;
		uint8_t event = (op_code == GATT_HANDLE_VALUE_NOTIF)
		? GATTC_OPTYPE_NOTIFICATION
		: GATTC_OPTYPE_INDICATION;