Merge changes Ieb632fc4,I7152fcf3,I4ed86627,Ib7d747de,I8991b2ca am: 29b8ab5cfc (c358489e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_act.cc

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -102,7 +102,6 @@ static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, const RawAddress& bd_addr,
	void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {		void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	/* initialize control block */		/* initialize control block */
	p_scb->reg_services = data.api_register.services;		p_scb->reg_services = data.api_register.services;
	p_scb->serv_sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
	p_scb->features = data.api_register.features;		p_scb->features = data.api_register.features;
	p_scb->app_id = data.api_register.app_id;		p_scb->app_id = data.api_register.app_id;

	@@ -175,7 +174,6 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	******************************************************************************/		******************************************************************************/
	void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {		void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	p_scb->peer_addr = data.api_open.bd_addr;		p_scb->peer_addr = data.api_open.bd_addr;
	p_scb->cli_sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
	p_scb->open_services = p_scb->reg_services;		p_scb->open_services = p_scb->reg_services;

	/* Check if RFCOMM has any incoming connection to avoid collision. */		/* Check if RFCOMM has any incoming connection to avoid collision. */

system/bta/ag/bta_ag_int.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -197,8 +197,6 @@ struct tBTA_AG_SCB {
	tBTA_SERVICE_MASK reg_services; /* services specified in register API */		tBTA_SERVICE_MASK reg_services; /* services specified in register API */
	tBTA_SERVICE_MASK open_services; /* services specified in open API */		tBTA_SERVICE_MASK open_services; /* services specified in open API */
	uint16_t conn_handle; /* RFCOMM handle of connected service */		uint16_t conn_handle; /* RFCOMM handle of connected service */
	tBTA_SEC serv_sec_mask; /* server security mask */
	tBTA_SEC cli_sec_mask; /* client security mask */
	tBTA_AG_FEAT features; /* features registered by application */		tBTA_AG_FEAT features; /* features registered by application */
	tBTA_AG_PEER_FEAT peer_features; /* peer device features */		tBTA_AG_PEER_FEAT peer_features; /* peer device features */
	uint16_t peer_sdp_features; /* peer device SDP features */		uint16_t peer_sdp_features; /* peer device SDP features */

system/bta/ag/bta_ag_rfc.cc

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -261,7 +261,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) {
	bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,		bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,
	RawAddress::kAny, &(p_scb->serv_handle[i]),		RawAddress::kAny, &(p_scb->serv_handle[i]),
	bta_ag_mgmt_cback_tbl[management_callback_index], bta_ag_sec_id[i],		bta_ag_mgmt_cback_tbl[management_callback_index], bta_ag_sec_id[i],
	p_scb->serv_sec_mask);		BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
	if (status == PORT_SUCCESS) {		if (status == PORT_SUCCESS) {
	bta_ag_setup_port(p_scb, p_scb->serv_handle[i]);		bta_ag_setup_port(p_scb, p_scb->serv_handle[i]);
	} else {		} else {
	@@ -335,7 +335,8 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,		bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,
	p_scb->peer_addr, &(p_scb->conn_handle),		p_scb->peer_addr, &(p_scb->conn_handle),
	bta_ag_mgmt_cback_tbl[management_callback_index],		bta_ag_mgmt_cback_tbl[management_callback_index],
	bta_ag_sec_id[p_scb->conn_service], p_scb->cli_sec_mask);		bta_ag_sec_id[p_scb->conn_service],
			BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
	APPL_TRACE_DEBUG(		APPL_TRACE_DEBUG(
	"%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"		"%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"
	" status=%d",		" status=%d",

system/bta/hh/bta_hh_act.cc

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ void bta_hh_api_enable(tBTA_HH_DATA* p_data) {

	memset(&bta_hh_cb, 0, sizeof(tBTA_HH_CB));		memset(&bta_hh_cb, 0, sizeof(tBTA_HH_CB));

	HID_HostSetSecurityLevel("", p_data->api_enable.sec_mask);		HID_HostSetSecurityLevel();

	/* Register with L2CAP */		/* Register with L2CAP */
	if (HID_HostRegister(bta_hh_cback) == HID_SUCCESS) {		if (HID_HostRegister(bta_hh_cback) == HID_SUCCESS) {
	@@ -184,7 +184,7 @@ static void bta_hh_sdp_cback(uint16_t result, uint16_t attr_mask,
	/* make sure sdp succeeded and hh has not been disabled */		/* make sure sdp succeeded and hh has not been disabled */
	if ((result == SDP_SUCCESS) && (p_cb != NULL)) {		if ((result == SDP_SUCCESS) && (p_cb != NULL)) {
	/* security is required for the connection, add attr_mask bit*/		/* security is required for the connection, add attr_mask bit*/
	if (p_cb->sec_mask) attr_mask \|= HID_SEC_REQUIRED;		attr_mask \|= HID_SEC_REQUIRED;

	#if (BTA_HH_DEBUG == TRUE)		#if (BTA_HH_DEBUG == TRUE)
	APPL_TRACE_EVENT("%s: p_cb: %d result 0x%02x, attr_mask 0x%02x, handle %x",		APPL_TRACE_EVENT("%s: p_cb: %d result 0x%02x, attr_mask 0x%02x, handle %x",
	@@ -312,7 +312,6 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
	tBTA_HH_STATUS status = BTA_HH_ERR_SDP;		tBTA_HH_STATUS status = BTA_HH_ERR_SDP;
	uint8_t hdl;		uint8_t hdl;

	p_cb->sec_mask = p_data->api_conn.sec_mask;
	p_cb->mode = p_data->api_conn.mode;		p_cb->mode = p_data->api_conn.mode;
	bta_hh_cb.p_cur = p_cb;		bta_hh_cb.p_cur = p_cb;

	@@ -415,7 +414,7 @@ void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
	if (!p_cb->incoming_conn) {		if (!p_cb->incoming_conn) {
	tHID_STATUS ret;		tHID_STATUS ret;
	/* set security level */		/* set security level */
	HID_HostSetSecurityLevel("", p_cb->sec_mask);		HID_HostSetSecurityLevel();

	/* open HID connection */		/* open HID connection */
	ret = HID_HostOpenDev(p_cb->hid_handle);		ret = HID_HostOpenDev(p_cb->hid_handle);

system/bta/hh/bta_hh_api.cc

+0 −43

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,6 @@ void BTA_HhEnable(tBTA_HH_CBACK* p_cback) {

	p_buf->hdr.event = BTA_HH_API_ENABLE_EVT;		p_buf->hdr.event = BTA_HH_API_ENABLE_EVT;
	p_buf->p_cback = p_cback;		p_buf->p_cback = p_cback;
	p_buf->sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;

	bta_sys_sendmsg(p_buf);		bta_sys_sendmsg(p_buf);
	}		}
	@@ -127,7 +126,6 @@ void BTA_HhOpen(const RawAddress& dev_bda) {

	p_buf->hdr.event = BTA_HH_API_OPEN_EVT;		p_buf->hdr.event = BTA_HH_API_OPEN_EVT;
	p_buf->hdr.layer_specific = BTA_HH_INVALID_HANDLE;		p_buf->hdr.layer_specific = BTA_HH_INVALID_HANDLE;
	p_buf->sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
	p_buf->mode = mode;		p_buf->mode = mode;
	p_buf->bd_addr = dev_bda;		p_buf->bd_addr = dev_bda;

	@@ -373,45 +371,4 @@ void BTA_HhRemoveDev(uint8_t dev_handle) {
	/* Utility Function */		/* Utility Function */
	/******************************************************************************/		/******************************************************************************/

	/*******************************************************************************
	*
	* Function BTA_HhParseBootRpt
	*
	* Description This utility function parse a boot mode report.
	* For keyboard report, report data will carry the keycode max
	* up to 6 key press in one report. Application need to convert
	* the keycode into keypress character according to keyboard
	* language.
	*
	* Returns void
	*
	******************************************************************************/
	void BTA_HhParseBootRpt(tBTA_HH_BOOT_RPT* p_data, uint8_t* p_report,
	uint16_t report_len) {
	p_data->dev_type = BTA_HH_DEVT_UNKNOWN;

	if (p_report) {
	/* first byte is report ID */
	switch (p_report[0]) {
	case BTA_HH_KEYBD_RPT_ID: /* key board report ID */
	p_data->dev_type = p_report[0];
	bta_hh_parse_keybd_rpt(p_data, p_report + 1,
	(uint16_t)(report_len - 1));
	break;

	case BTA_HH_MOUSE_RPT_ID: /* mouse report ID */
	p_data->dev_type = p_report[0];
	bta_hh_parse_mice_rpt(p_data, p_report + 1, (uint16_t)(report_len - 1));
	break;

	default:
	APPL_TRACE_DEBUG("Unknown boot report: %d", p_report[0]);
	;
	break;
	}
	}

	return;
	}

	#endif /* BTA_HH_INCLUDED */		#endif /* BTA_HH_INCLUDED */