Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size (971931e7) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btu/btu_hcif.cc

+16 −0

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,14 @@ constexpr uint8_t MIN_KEY_SIZE = 7;

		static void read_encryption_key_size_complete_after_encryption_change(uint8_t status, uint16_t handle,
		uint8_t key_size) {
		if (status == HCI_ERR_INSUFFCIENT_SECURITY) {
		/* If remote device stop the encryption before we call "Read Encryption Key
		* Size", we might receive Insufficient Security, which means that link is
		* no longer encrypted. */
		LOG(INFO) << __func__ << ": encryption stopped on link: " << loghex(handle);
		return;
		}

		if (status != HCI_SUCCESS) {
		LOG(INFO) << __func__ << ": disconnecting, status: " << loghex(status);
		btsnd_hcic_disconnect(handle, HCI_ERR_PEER_USER);
		@@ -2051,6 +2059,14 @@ static void btu_hcif_enhanced_flush_complete_evt(void) {
		**********************************************/

		static void read_encryption_key_size_complete_after_key_refresh(uint8_t status, uint16_t handle, uint8_t key_size) {
		if (status == HCI_ERR_INSUFFCIENT_SECURITY) {
		/* If remote device stop the encryption before we call "Read Encryption Key
		* Size", we might receive Insufficient Security, which means that link is
		* no longer encrypted. */
		LOG(INFO) << __func__ << ": encryption stopped on link: " << loghex(handle);
		return;
		}

		if (status != HCI_SUCCESS) {
		LOG(INFO) << __func__ << ": disconnecting, status: " << loghex(status);
		btsnd_hcic_disconnect(handle, HCI_ERR_PEER_USER);