Merge "Wait to notify encryption complete when bonding" into main am: ba0f75eb35 (8eb2bffc) · Commits · e / os / android_packages_modules_Bluetooth

system/conf/interop_database.conf

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -850,3 +850,9 @@ fc:3f:a6 = Address_Based
	[INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT]		[INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT]
	00:e0:4c = Address_Based		00:e0:4c = Address_Based
	00:9e:c8 = Address_Based		00:9e:c8 = Address_Based

			# Certain devices have issue where they cannot handle ATT traffic during SMP key exchange.
			# For those devices, queued ATT writes are delayed until after both encryption complete and
			# SMP key exchange completed.
			[INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING]
			ORN = Name_Based

system/device/include/interop.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -334,6 +334,11 @@ typedef enum {
	// need we initiate connection after signalling timeout		// need we initiate connection after signalling timeout
	INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT,		INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT,

			// Certain devices have issue where they cannot handle ATT traffic during SMP
			// key exchange. For those devices, queued ATT writes are delayed until after
			// both encryption complete and SMP key exchange completed.
			INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING,

	END_OF_INTEROP_LIST		END_OF_INTEROP_LIST
	} interop_feature_t;		} interop_feature_t;

system/device/src/interop.cc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -392,6 +392,7 @@ static const char* interop_feature_string_(const interop_feature_t feature) {
	CASE_RETURN_STR(INTEROP_HFP_1_7_ALLOWLIST);		CASE_RETURN_STR(INTEROP_HFP_1_7_ALLOWLIST);
	CASE_RETURN_STR(INTEROP_HFP_1_9_ALLOWLIST);		CASE_RETURN_STR(INTEROP_HFP_1_9_ALLOWLIST);
	CASE_RETURN_STR(INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT);		CASE_RETURN_STR(INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT);
			CASE_RETURN_STR(INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING);
	}		}
	return UNKNOWN_INTEROP_FEATURE;		return UNKNOWN_INTEROP_FEATURE;
	}		}

system/stack/btm/btm_ble_sec.cc

+58 −17

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,8 @@
	#include "btif/include/btif_storage.h"		#include "btif/include/btif_storage.h"
	#include "crypto_toolbox/crypto_toolbox.h"		#include "crypto_toolbox/crypto_toolbox.h"
	#include "device/include/controller.h"		#include "device/include/controller.h"
			#include "device/include/interop.h"
			#include "device/include/interop_config.h"
	#include "os/log.h"		#include "os/log.h"
	#include "osi/include/allocator.h"		#include "osi/include/allocator.h"
	#include "osi/include/properties.h"		#include "osi/include/properties.h"
	@@ -39,6 +41,7 @@
	#include "stack/btm/security_device_record.h"		#include "stack/btm/security_device_record.h"
	#include "stack/eatt/eatt.h"		#include "stack/eatt/eatt.h"
	#include "stack/include/acl_api.h"		#include "stack/include/acl_api.h"
			#include "stack/include/bt_name.h"
	#include "stack/include/bt_octets.h"		#include "stack/include/bt_octets.h"
	#include "stack/include/bt_types.h"		#include "stack/include/bt_types.h"
	#include "stack/include/btm_api.h"		#include "stack/include/btm_api.h"
	@@ -1251,6 +1254,40 @@ tBTM_STATUS btm_ble_start_encrypt(const RawAddress& bda, bool use_stk,
	return BTM_CMD_STARTED;		return BTM_CMD_STARTED;
	}		}

			/*******************************************************************************
			*
			* Function btm_ble_notify_enc_cmpl
			*
			* Description This function is called to connect EATT and notify GATT to
			* send data if any request is pending. This either happens on
			* encryption complete event, or if bond is pending, after SMP
			* notifies that bonding is complete.
			*
			* Returns void
			*
			******************************************************************************/
			static void btm_ble_notify_enc_cmpl(const RawAddress& bd_addr,
			bool encr_enable) {
			if (encr_enable) {
			uint8_t remote_lmp_version = 0;
			if (!BTM_ReadRemoteVersion(bd_addr, &remote_lmp_version, nullptr,
			nullptr) \|\|
			remote_lmp_version == 0) {
			LOG_WARN("BLE Unable to determine remote version");
			}

			if (remote_lmp_version == 0 \|\|
			remote_lmp_version >= HCI_PROTO_VERSION_5_0) {
			/* Link is encrypted, start EATT if remote LMP version is unknown, or 5.2
			* or greater */
			bluetooth::eatt::EattExtension::GetInstance()->Connect(bd_addr);
			}
			}

			/* to notify GATT to send data if any request is pending */
			gatt_notify_enc_cmpl(bd_addr);
			}

	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function btm_ble_link_encrypted		* Function btm_ble_link_encrypted
	@@ -1295,26 +1332,22 @@ void btm_ble_link_encrypted(const RawAddress& bd_addr, uint8_t encr_enable) {
	btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, true);		btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, true);
	}		}

	if (encr_enable) {		tBTM_BD_NAME remote_name = {};
	uint8_t remote_ll_version = 0;		/* to notify GATT to send data if any request is pending,
	if (!BTM_ReadRemoteVersion(p_dev_rec->ble.pseudo_addr, &remote_ll_version,		or if IOP matched, delay notifying until SMP_CMPLT_EVT */
	nullptr, nullptr) \|\|		if (BTM_GetRemoteDeviceName(p_dev_rec->ble.pseudo_addr, remote_name) &&
	remote_ll_version == 0) {		interop_match_name(INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING,
	LOG_WARN("BLE Unable to determine remote version");		(const char*)remote_name) &&
	}		(btm_sec_cb.pairing_flags & BTM_PAIR_FLAGS_LE_ACTIVE) &&
			btm_sec_cb.pairing_bda == p_dev_rec->ble.pseudo_addr) {
	if (remote_ll_version == 0 \|\| remote_ll_version >= HCI_PROTO_VERSION_5_0) {		LOG_INFO(
	/* Link is encrypted, start EATT if remote LMP version is unknown, or 5.0		"INTEROP_DELAY_ATT_TRAFFIC_DURING_PAIRING: Waiting for bonding to "
	* or greater */		"complete to notify enc complete");
	bluetooth::eatt::EattExtension::GetInstance()->Connect(		} else {
	p_dev_rec->ble.pseudo_addr);		btm_ble_notify_enc_cmpl(p_dev_rec->ble.pseudo_addr, encr_enable);
	}		}
	}		}

	/* to notify GATT to send data if any request is pending */
	gatt_notify_enc_cmpl(p_dev_rec->ble.pseudo_addr);
	}

	/*******************************************************************************		/*******************************************************************************
	*		*
	* Function btm_ble_ltk_request_reply		* Function btm_ble_ltk_request_reply
	@@ -1631,6 +1664,14 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr,
	p_dev_rec->ble_keys.key_type = BTM_LE_KEY_NONE;		p_dev_rec->ble_keys.key_type = BTM_LE_KEY_NONE;
	}		}
	}		}
			tBTM_BD_NAME remote_name = {};
			if (BTM_GetRemoteDeviceName(p_dev_rec->ble.pseudo_addr,
			remote_name) &&
			interop_match_name(INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING,
			(const char*)remote_name)) {
			LOG_DEBUG("Notifying encryption cmpl delayed due to IOP match");
			btm_ble_notify_enc_cmpl(p_dev_rec->ble.pseudo_addr, true);
			}

	btm_sec_dev_rec_cback_event(p_dev_rec, res, true);		btm_sec_dev_rec_cback_event(p_dev_rec, res, true);
	}		}