Merge "SM: Implement name request during Classic pairing" am: 53d29f360d (3901d43c) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/security/pairing/classic_pairing_handler.cc

+21 −1

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,22 @@ void ClassicPairingHandler::Initiate(bool locally_initiated, hci::IoCapability i
	GetChannel()->Connect(GetRecord()->GetPseudoAddress()->GetAddress());		GetChannel()->Connect(GetRecord()->GetPseudoAddress()->GetAddress());
	}		}

			void ClassicPairingHandler::OnNameRequestComplete(hci::Address address, bool success) {
			if (GetNameDbModule()->IsNameCached(address)) {
			auto remote_name = GetNameDbModule()->ReadCachedRemoteName(address);
			std::string tmp_name;
			for (uint8_t i : remote_name) {
			tmp_name += i;
			}
			device_name_ = tmp_name;
			}
			has_gotten_name_response_ = true;
			if (user_confirmation_request_) {
			this->OnReceive(*user_confirmation_request_);
			user_confirmation_request_ = std::nullopt;
			}
			}

	void ClassicPairingHandler::Cancel() {		void ClassicPairingHandler::Cancel() {
	if (is_cancelled_) return;		if (is_cancelled_) return;
	is_cancelled_ = true;		is_cancelled_ = true;
	@@ -152,6 +168,10 @@ void ClassicPairingHandler::OnReceive(hci::IoCapabilityRequestView packet) {
	auto reply_packet = hci::IoCapabilityRequestReplyBuilder::Create(		auto reply_packet = hci::IoCapabilityRequestReplyBuilder::Create(
	GetRecord()->GetPseudoAddress()->GetAddress(), io_capability, oob_present, authentication_requirements);		GetRecord()->GetPseudoAddress()->GetAddress(), io_capability, oob_present, authentication_requirements);
	this->GetChannel()->SendCommand(std::move(reply_packet));		this->GetChannel()->SendCommand(std::move(reply_packet));
			GetNameDbModule()->ReadRemoteNameRequest(
			GetRecord()->GetPseudoAddress()->GetAddress(),
			common::BindOnce(&ClassicPairingHandler::OnNameRequestComplete, common::Unretained(this)),
			security_handler_);
	}		}

	void ClassicPairingHandler::OnReceive(hci::IoCapabilityResponseView packet) {		void ClassicPairingHandler::OnReceive(hci::IoCapabilityResponseView packet) {
	@@ -290,7 +310,7 @@ void ClassicPairingHandler::OnReceive(hci::KeypressNotificationView packet) {

	void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) {		void ClassicPairingHandler::OnReceive(hci::UserConfirmationRequestView packet) {
	// Ensure we have io cap response otherwise checks will be wrong if it comes late		// Ensure we have io cap response otherwise checks will be wrong if it comes late
	if (!has_gotten_io_cap_response_) {		if (!has_gotten_io_cap_response_ \|\| !has_gotten_name_response_) {
	user_confirmation_request_ = std::make_optional<hci::UserConfirmationRequestView>(packet);		user_confirmation_request_ = std::make_optional<hci::UserConfirmationRequestView>(packet);
	return;		return;
	}		}

system/gd/security/pairing/classic_pairing_handler.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,8 @@ class ClassicPairingHandler : public PairingHandler {
	void OnConfirmYesNo(const bluetooth::hci::AddressWithType& address, bool confirmed) override;		void OnConfirmYesNo(const bluetooth::hci::AddressWithType& address, bool confirmed) override;
	void OnPasskeyEntry(const bluetooth::hci::AddressWithType& address, uint32_t passkey) override;		void OnPasskeyEntry(const bluetooth::hci::AddressWithType& address, uint32_t passkey) override;

			void OnNameRequestComplete(hci::Address address, bool success);

	private:		private:
	void OnUserInput(bool user_input);		void OnUserInput(bool user_input);
	void OnPasskeyInput(uint32_t passkey);		void OnPasskeyInput(uint32_t passkey);
	@@ -109,6 +111,7 @@ class ClassicPairingHandler : public PairingHandler {
	bool is_cancelled_ = false;		bool is_cancelled_ = false;

	bool has_gotten_io_cap_response_ = false;		bool has_gotten_io_cap_response_ = false;
			bool has_gotten_name_response_ = false;
	std::optional<hci::UserConfirmationRequestView> user_confirmation_request_ = std::nullopt;		std::optional<hci::UserConfirmationRequestView> user_confirmation_request_ = std::nullopt;

	hci::ErrorCode last_status_ = hci::ErrorCode::UNKNOWN_HCI_COMMAND;		hci::ErrorCode last_status_ = hci::ErrorCode::UNKNOWN_HCI_COMMAND;