Merge "btm_sec: Update LOGs in read_encryption_key_size" into main (a1b4fa18) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_sec.cc

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3974,21 +3974,21 @@ static void read_encryption_key_size_complete_after_key_refresh(
	/* If remote device stop the encryption before we call "Read Encryption Key		/* If remote device stop the encryption before we call "Read Encryption Key
	* Size", we might receive Insufficient Security, which means that link is		* Size", we might receive Insufficient Security, which means that link is
	* no longer encrypted. */		* no longer encrypted. */
	LOG(INFO) << __func__ << ": encryption stopped on link: " << loghex(handle);		LOG_INFO("encryption stopped on link: 0x%x ", handle);
	return;		return;
	}		}

	if (status != HCI_SUCCESS) {		if (status != HCI_SUCCESS) {
	LOG(INFO) << __func__ << ": disconnecting, status: " << loghex(status);		LOG_INFO("disconnecting, status: 0x%x", status);
	acl_disconnect_from_handle(handle, HCI_ERR_PEER_USER,		acl_disconnect_from_handle(handle, HCI_ERR_PEER_USER,
	"stack::btu_hcif Key size fail");		"stack::btu_hcif Key size fail");
	return;		return;
	}		}

	if (key_size < MIN_KEY_SIZE) {		if (key_size < MIN_KEY_SIZE) {
	LOG(ERROR) << __func__		LOG_ERROR(
	<< " encryption key too short, disconnecting. handle: "		"encryption key too short, disconnecting. handle: 0x%x key_size %d",
	<< loghex(handle) << " key_size: " << +key_size;		handle, key_size);

	acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,		acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,
	"stack::btu::btu_hcif::read_encryption_key_size_"		"stack::btu::btu_hcif::read_encryption_key_size_"