Merge changes Ic895dce8,I80b661d6,I108d89b0,Ia0963f5e,I63d2703c, ... am: cb35bc69e1 (ef26ed17) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+27 −81

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ static void bta_dm_remname_cback(void* p);
		static void bta_dm_find_services(const RawAddress& bd_addr);
		static void bta_dm_discover_next_device(void);
		static void bta_dm_sdp_callback(uint16_t sdp_status);
		static uint8_t bta_dm_authorize_cback(uint8_t service_id);
		static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,
		BD_NAME bd_name, bool min_16_digit);
		static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
		@@ -232,8 +231,7 @@ const uint32_t bta_service_id_to_btm_srv_id_lkup_tbl[BTA_MAX_SERVICE_ID] = {
		};

		/* bta security callback */
		const tBTM_APPL_INFO bta_security = {&bta_dm_authorize_cback,
		&bta_dm_pin_cback,
		const tBTM_APPL_INFO bta_security = {&bta_dm_pin_cback,
		&bta_dm_new_link_key_cback,
		&bta_dm_authentication_complete_cback,
		&bta_dm_bond_cancel_complete_cback,
		@@ -629,18 +627,14 @@ void bta_dm_remove_device(const RawAddress& bd_addr) {
		void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg) {
		uint8_t* p_dc = NULL;
		LinkKey* p_lc = NULL;
		uint32_t trusted_services_mask[BTM_SEC_SERVICE_ARRAY_SIZE];

		memset(trusted_services_mask, 0, sizeof(trusted_services_mask));

		/* If not all zeros, the device class has been specified */
		if (msg->dc_known) p_dc = (uint8_t*)msg->dc;

		if (msg->link_key_known) p_lc = &msg->link_key;

		if (!BTM_SecAddDevice(msg->bd_addr, p_dc, msg->bd_name, msg->features,
		trusted_services_mask, p_lc, msg->key_type,
		msg->pin_length)) {
		if (!BTM_SecAddDevice(msg->bd_addr, p_dc, msg->bd_name, msg->features, p_lc,
		msg->key_type, msg->pin_length)) {
		LOG(ERROR) << "BTA_DM: Error adding device " << msg->bd_addr;
		}
		}
		@@ -685,7 +679,7 @@ void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
		char* p_name;

		tBTM_STATUS status =
		BTM_SecBond(bd_addr, addr_type, transport, device_type, 0, NULL, 0);
		BTM_SecBond(bd_addr, addr_type, transport, device_type, 0, NULL);

		if (bta_dm_cb.p_sec_cback && (status != BTM_CMD_STARTED)) {
		memset(&sec_event, 0, sizeof(tBTA_DM_SEC));
		@@ -729,20 +723,10 @@ void bta_dm_bond_cancel(const RawAddress& bd_addr) {

		/** Send the pin_reply to a request from BTM */
		void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg) {
		uint32_t trusted_mask[BTM_SEC_SERVICE_ARRAY_SIZE];

		uint32_t* current_trusted_mask = BTM_ReadTrustedMask(msg->bd_addr);
		if (current_trusted_mask) {
		memcpy(trusted_mask, current_trusted_mask, sizeof(trusted_mask));
		} else {
		memset(trusted_mask, 0, sizeof(trusted_mask));
		}

		if (msg->accept) {
		BTM_PINCodeReply(msg->bd_addr, BTM_SUCCESS, msg->pin_len, msg->p_pin,
		trusted_mask);
		BTM_PINCodeReply(msg->bd_addr, BTM_SUCCESS, msg->pin_len, msg->p_pin);
		} else {
		BTM_PINCodeReply(msg->bd_addr, BTM_NOT_AUTHORIZED, 0, NULL, trusted_mask);
		BTM_PINCodeReply(msg->bd_addr, BTM_NOT_AUTHORIZED, 0, NULL);
		}
		}

		@@ -1782,39 +1766,6 @@ static void bta_dm_remname_cback(void* p) {
		bta_sys_sendmsg(p_msg);
		}

		/*******************************************************************************
		*
		* Function bta_dm_authorize_cback
		*
		* Description cback requesting authorization
		*
		* Returns void
		*
		******************************************************************************/
		static uint8_t bta_dm_authorize_cback(uint8_t service_id) {
		uint8_t index = 1;
		while (index < BTA_MAX_SERVICE_ID) {
		/* get the BTA service id corresponding to BTM id */
		if (bta_service_id_to_btm_srv_id_lkup_tbl[index] == service_id) {
		break;
		}
		index++;
		}

		/* if supported service callback otherwise not authorized */
		if (bta_dm_cb.p_sec_cback && (index < BTA_MAX_SERVICE_ID
		#if (BTA_JV_INCLUDED == TRUE)
		/* pass through JV service ID */
		\|\| (service_id >= BTA_FIRST_JV_SERVICE_ID &&
		service_id <= BTA_LAST_JV_SERVICE_ID)
		#endif
		)) {
		return BTM_CMD_STARTED;
		} else {
		return BTM_NOT_AUTHORIZED;
		}
		}

		/*******************************************************************************
		*
		* Function bta_dm_pinname_cback
		@@ -1936,8 +1887,6 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

		memset(&sec_event, 0, sizeof(tBTA_DM_SEC));

		/* Not AMP Key type */
		if (key_type != HCI_LKEY_TYPE_AMP_WIFI && key_type != HCI_LKEY_TYPE_AMP_UWB) {
		event = BTA_DM_AUTH_CMPL_EVT;
		p_auth_cmpl = &sec_event.auth_cmpl;

		@@ -1962,9 +1911,6 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,
		// reconnection.
		if (bta_dm_cb.device_list.count)
		bta_dm_reset_sec_dev_pending(p_auth_cmpl->bd_addr);
		} else {
		APPL_TRACE_WARNING("%s() Received AMP Key", __func__);
		}

		return BTM_CMD_STARTED;
		}

system/bta/hearing_aid/hearing_aid.cc

+3 −7

Original line number	Diff line number	Diff line
		@@ -407,20 +407,16 @@ class HearingAidImpl : public HearingAid {
		}

		/* verify bond */
		uint8_t sec_flag = 0;
		BTM_GetSecurityFlagsByTransport(address, &sec_flag, BT_TRANSPORT_LE);

		if (sec_flag & BTM_SEC_FLAG_ENCRYPTED) {
		if (BTM_IsEncrypted(address, BT_TRANSPORT_LE)) {
		/* if link has been encrypted */
		OnEncryptionComplete(address, true);
		return;
		}

		if (sec_flag & BTM_SEC_FLAG_LKEY_KNOWN) {
		if (BTM_IsLinkKeyKnown(address, BT_TRANSPORT_LE)) {
		/* if bonded and link not encrypted */
		sec_flag = BTM_BLE_SEC_ENCRYPT;
		BTM_SetEncryption(address, BT_TRANSPORT_LE, encryption_callback, nullptr,
		sec_flag);
		BTM_BLE_SEC_ENCRYPT);
		return;
		}

system/bta/hh/bta_hh_le.cc

+6 −18

Original line number	Diff line number	Diff line
		@@ -1074,36 +1074,29 @@ void bta_hh_clear_service_cache(tBTA_HH_DEV_CB* p_cb) {
		******************************************************************************/
		void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb,
		UNUSED_ATTR tBTA_HH_DATA* p_buf) {
		uint8_t sec_flag = 0;

		if (BTM_SecIsSecurityPending(p_cb->addr)) {
		/* if security collision happened, wait for encryption done */
		p_cb->security_pending = true;
		return;
		}

		/* verify bond */
		BTM_GetSecurityFlagsByTransport(p_cb->addr, &sec_flag, BT_TRANSPORT_LE);

		/* if link has been encrypted */
		if (sec_flag & BTM_SEC_FLAG_ENCRYPTED) {
		if (BTM_IsEncrypted(p_cb->addr, BT_TRANSPORT_LE)) {
		p_cb->status = BTA_HH_OK;
		bta_hh_sm_execute(p_cb, BTA_HH_ENC_CMPL_EVT, NULL);
		}
		/* if bonded and link not encrypted */
		else if (sec_flag & BTM_SEC_FLAG_LKEY_KNOWN) {
		sec_flag = BTM_BLE_SEC_ENCRYPT;
		else if (BTM_IsLinkKeyKnown(p_cb->addr, BT_TRANSPORT_LE)) {
		p_cb->status = BTA_HH_ERR_AUTH_FAILED;
		BTM_SetEncryption(p_cb->addr, BT_TRANSPORT_LE, bta_hh_le_encrypt_cback,
		NULL, sec_flag);
		NULL, BTM_BLE_SEC_ENCRYPT);
		}
		/* unbonded device, report security error here */
		else if (p_cb->sec_mask != BTA_SEC_NONE) {
		sec_flag = BTM_BLE_SEC_ENCRYPT_NO_MITM;
		p_cb->status = BTA_HH_ERR_AUTH_FAILED;
		bta_hh_clear_service_cache(p_cb);
		BTM_SetEncryption(p_cb->addr, BT_TRANSPORT_LE, bta_hh_le_encrypt_cback,
		NULL, sec_flag);
		NULL, BTM_BLE_SEC_ENCRYPT_NO_MITM);
		}
		/* otherwise let it go through */
		else {
		@@ -1969,19 +1962,14 @@ void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB* p_cb) {
		*
		******************************************************************************/
		static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB* p_cb, bool check_bond) {
		uint8_t sec_flag = 0;
		bool to_add = true;

		if (check_bond) {
		/* start reconnection if remote is a bonded device */
		/* verify bond */
		BTM_GetSecurityFlagsByTransport(p_cb->addr, &sec_flag, BT_TRANSPORT_LE);

		if ((sec_flag & BTM_SEC_FLAG_LKEY_KNOWN) == 0) to_add = false;
		if (!BTM_IsLinkKeyKnown(p_cb->addr, BT_TRANSPORT_LE)) to_add = false;
		}

		if (/p_cb->dscp_info.flag & BTA_HH_LE_NORMAL_CONN &&/
		!p_cb->in_bg_conn && to_add) {
		if (!p_cb->in_bg_conn && to_add) {
		/* add device into BG connection to accept remote initiated connection */
		BTA_GATTC_Open(bta_hh_cb.gatt_if, p_cb->addr, false, BT_TRANSPORT_LE,
		false);

system/bta/include/bta_jv_api.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -409,18 +409,6 @@ tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK* p_cback);
		******************************************************************************/
		void BTA_JvDisable(void);

		/*******************************************************************************
		*
		* Function BTA_JvIsEncrypted
		*
		* Description This function checks if the link to peer device is encrypted
		*
		* Returns true if encrypted.
		* false if not.
		*
		******************************************************************************/
		bool BTA_JvIsEncrypted(const RawAddress& bd_addr);

		/*******************************************************************************
		*
		* Function BTA_JvGetChannelId

system/bta/jv/bta_jv_api.cc

+0 −21

Original line number	Diff line number	Diff line
		@@ -90,27 +90,6 @@ void BTA_JvDisable(void) {
		do_in_main_thread(FROM_HERE, Bind(&bta_jv_disable));
		}

		/*******************************************************************************
		*
		* Function BTA_JvIsEncrypted
		*
		* Description This function checks if the link to peer device is encrypted
		*
		* Returns true if encrypted.
		* false if not.
		*
		******************************************************************************/
		bool BTA_JvIsEncrypted(const RawAddress& bd_addr) {
		bool is_encrypted = false;
		uint8_t sec_flags, le_flags;

		if (BTM_GetSecurityFlags(bd_addr, &sec_flags) &&
		BTM_GetSecurityFlagsByTransport(bd_addr, &le_flags, BT_TRANSPORT_LE)) {
		if (sec_flags & BTM_SEC_FLAG_ENCRYPTED \|\| le_flags & BTM_SEC_FLAG_ENCRYPTED)
		is_encrypted = true;
		}
		return is_encrypted;
		}
		/*******************************************************************************
		*
		* Function BTA_JvGetChannelId