Merge "AVDT: Flatten sec mask" (74a69948) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_aact.cc

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1400,8 +1400,7 @@ void bta_av_connect_req(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
	return;		return;
	}		}

	AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, BTA_SEC_AUTHENTICATE,		AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, &bta_av_proc_stream_evt);
	&bta_av_proc_stream_evt);
	}		}

	/*******************************************************************************		/*******************************************************************************
	@@ -2692,8 +2691,7 @@ void bta_av_rcfg_connect(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
	/* let bta_av_rcfg_failed report fail */		/* let bta_av_rcfg_failed report fail */
	bta_av_rcfg_failed(p_scb, NULL);		bta_av_rcfg_failed(p_scb, NULL);
	} else {		} else {
	AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, BTA_SEC_AUTHENTICATE,		AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, &bta_av_proc_stream_evt);
	&bta_av_proc_stream_evt);
	}		}
	}		}

	@@ -2724,8 +2722,7 @@ void bta_av_rcfg_discntd(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
	/* report close event & go to init state */		/* report close event & go to init state */
	bta_av_ssm_execute(p_scb, BTA_AV_STR_DISC_FAIL_EVT, NULL);		bta_av_ssm_execute(p_scb, BTA_AV_STR_DISC_FAIL_EVT, NULL);
	} else {		} else {
	AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, BTA_SEC_AUTHENTICATE,		AVDT_ConnectReq(p_scb->PeerAddress(), p_scb->hdi, &bta_av_proc_stream_evt);
	&bta_av_proc_stream_evt);
	}		}
	}		}

system/stack/avdt/avdt_api.cc

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -979,13 +979,13 @@ uint16_t AVDT_WriteReq(uint8_t handle, BT_HDR* p_pkt, uint32_t time_stamp,
	*		*
	******************************************************************************/		******************************************************************************/
	uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index,		uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index,
	uint8_t sec_mask, tAVDT_CTRL_CBACK* p_cback) {		tAVDT_CTRL_CBACK* p_cback) {
	AvdtpCcb* p_ccb = NULL;		AvdtpCcb* p_ccb = NULL;
	uint16_t result = AVDT_SUCCESS;		uint16_t result = AVDT_SUCCESS;
	tAVDT_CCB_EVT evt;		tAVDT_CCB_EVT evt;

	AVDT_TRACE_WARNING("%s: address=%s channel_index=%d sec_mask=0x%x", __func__,		AVDT_TRACE_WARNING("%s: address=%s channel_index=%d", __func__,
	bd_addr.ToString().c_str(), channel_index, sec_mask);		bd_addr.ToString().c_str(), channel_index);

	/* find channel control block for this bd addr; if none, allocate one */		/* find channel control block for this bd addr; if none, allocate one */
	p_ccb = avdt_ccb_by_bd(bd_addr);		p_ccb = avdt_ccb_by_bd(bd_addr);
	@@ -1005,7 +1005,6 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index,
	if (result == AVDT_SUCCESS) {		if (result == AVDT_SUCCESS) {
	/* send event to ccb */		/* send event to ccb */
	evt.connect.p_cback = p_cback;		evt.connect.p_cback = p_cback;
	evt.connect.sec_mask = sec_mask;
	avdt_ccb_event(p_ccb, AVDT_CCB_API_CONNECT_REQ_EVT, &evt);		avdt_ccb_event(p_ccb, AVDT_CCB_API_CONNECT_REQ_EVT, &evt);
	}		}

system/stack/avdt/avdt_ccb_act.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -943,7 +943,7 @@ void avdt_ccb_set_conn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data) {

	/* set security level */		/* set security level */
	BTM_SetSecurityLevel(true, "", BTM_SEC_SERVICE_AVDTP,		BTM_SetSecurityLevel(true, "", BTM_SEC_SERVICE_AVDTP,
	p_data->connect.sec_mask, AVDT_PSM, 0, 0);		BTM_SEC_OUT_AUTHENTICATE, AVDT_PSM, 0, 0);
	}		}

	/*******************************************************************************		/*******************************************************************************

system/stack/avdt/avdt_int.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,6 @@ typedef struct {
	/* data type for AVDT_CCB_API_CONNECT_REQ_EVT */		/* data type for AVDT_CCB_API_CONNECT_REQ_EVT */
	typedef struct {		typedef struct {
	tAVDT_CTRL_CBACK* p_cback;		tAVDT_CTRL_CBACK* p_cback;
	uint8_t sec_mask;
	} tAVDT_CCB_API_CONNECT;		} tAVDT_CCB_API_CONNECT;

	/* data type for AVDT_CCB_API_DISCONNECT_REQ_EVT */		/* data type for AVDT_CCB_API_DISCONNECT_REQ_EVT */

system/stack/include/avdt_api.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -900,7 +900,7 @@ extern uint16_t AVDT_WriteReqOpt(uint8_t handle, BT_HDR* p_pkt,
	*		*
	******************************************************************************/		******************************************************************************/
	extern uint16_t AVDT_ConnectReq(const RawAddress& bd_addr,		extern uint16_t AVDT_ConnectReq(const RawAddress& bd_addr,
	uint8_t channel_index, uint8_t sec_mask,		uint8_t channel_index,
	tAVDT_CTRL_CBACK* p_cback);		tAVDT_CTRL_CBACK* p_cback);

	/*******************************************************************************		/*******************************************************************************