Merge "system/gd: Remove dependency from AclManager on SecurityModule" into main (ce2829d9) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/acl_manager.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -390,10 +390,6 @@ void AclManager::OnAdvertisingSetTerminated(
		}
		}

		void AclManager::SetSecurityModule(security::SecurityModule* security_module) {
		CallOn(pimpl_->classic_impl_, &classic_impl::set_security_module, security_module);
		}

		void AclManager::OnClassicSuspendInitiatedDisconnect(uint16_t handle, ErrorCode reason) {
		CallOn(pimpl_->classic_impl_, &classic_impl::on_classic_disconnect, handle, reason);
		}

system/gd/hci/acl_manager.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -33,9 +33,6 @@
		#include "os/handler.h"

		namespace bluetooth {
		namespace security {
		class SecurityModule;
		} // namespace security
		namespace shim {
		namespace legacy {
		class Acl;
		@@ -143,10 +140,6 @@ class AclManager : public Module {
		hci::AddressWithType adv_address,
		bool is_discoverable);

		// In order to avoid circular dependency use setter rather than module
		// dependency.
		virtual void SetSecurityModule(security::SecurityModule* security_module);

		virtual LeAddressManager* GetLeAddressManager();

		// Virtual ACL disconnect emitted during suspend.

system/gd/hci/acl_manager/classic_impl.h

+4 −34

Original line number	Diff line number	Diff line
		@@ -24,14 +24,15 @@
		#include "common/init_flags.h"
		#include "hci/acl_manager/acl_scheduler.h"
		#include "hci/acl_manager/assembler.h"
		#include "hci/acl_manager/connection_callbacks.h"
		#include "hci/acl_manager/connection_management_callbacks.h"
		#include "hci/acl_manager/round_robin_scheduler.h"
		#include "hci/class_of_device.h"
		#include "hci/controller.h"
		#include "hci/event_checkers.h"
		#include "hci/hci_layer.h"
		#include "hci/remote_name_request.h"
		#include "os/metrics.h"
		#include "security/security_manager_listener.h"
		#include "security/security_module.h"

		namespace bluetooth {
		namespace hci {
		@@ -49,7 +50,7 @@ struct acl_connection {
		ConnectionManagementCallbacks* connection_management_callbacks_ = nullptr;
		};

		struct classic_impl : public security::ISecurityManagerListener {
		struct classic_impl {
		classic_impl(
		HciLayer* hci_layer,
		Controller* controller,
		@@ -78,7 +79,6 @@ struct classic_impl : public security::ISecurityManagerListener {
		~classic_impl() {
		hci_layer_->PutAclConnectionInterface();
		connections.reset();
		security_manager_.reset();
		}

		void on_classic_event(EventView event_packet) {
		@@ -657,23 +657,6 @@ struct classic_impl : public security::ISecurityManagerListener {
		});
		}

		void OnEncryptionStateChanged(EncryptionChangeView encryption_change_view) override {
		if (!encryption_change_view.IsValid()) {
		log::error("Invalid packet");
		return;
		} else if (encryption_change_view.GetStatus() != ErrorCode::SUCCESS) {
		auto status = encryption_change_view.GetStatus();
		std::string error_code = ErrorCodeText(status);
		log::error("error_code {}", error_code);
		return;
		}
		uint16_t handle = encryption_change_view.GetConnectionHandle();
		connections.execute(handle, [=](ConnectionManagementCallbacks* callbacks) {
		EncryptionEnabled enabled = encryption_change_view.GetEncryptionEnabled();
		callbacks->OnEncryptionChange(enabled);
		});
		}

		void on_role_change(EventView packet) {
		RoleChangeView role_change_view = RoleChangeView::Create(packet);
		if (!role_change_view.IsValid()) {
		@@ -750,17 +733,6 @@ struct classic_impl : public security::ISecurityManagerListener {
		std::move(builder), handler_->BindOnce(check_status<RejectConnectionRequestStatusView>));
		}

		void OnDeviceBonded(bluetooth::hci::AddressWithType /* device */) override {}
		void OnDeviceUnbonded(bluetooth::hci::AddressWithType /* device */) override {}
		void OnDeviceBondFailed(
		bluetooth::hci::AddressWithType /* device */,
		security::PairingFailure /* status */) override {}

		void set_security_module(security::SecurityModule* security_module) {
		security_manager_ = security_module->GetSecurityManager();
		security_manager_->RegisterCallbackListener(this, handler_);
		}

		uint16_t HACK_get_handle(Address address) {
		return connections.HACK_get_handle(address);
		}
		@@ -793,8 +765,6 @@ struct classic_impl : public security::ISecurityManagerListener {

		common::Callback<bool(Address, ClassOfDevice)> should_accept_connection_;
		std::unique_ptr<RoleChangeView> delayed_role_change_ = nullptr;

		std::unique_ptr<security::SecurityManager> security_manager_;
		};

		} // namespace acl_manager

system/gd/security/security_module.cc

+0 −2

Original line number	Diff line number	Diff line
		@@ -111,8 +111,6 @@ void SecurityModule::Start() {
		GetDependency<hci::Controller>(),
		GetDependency<storage::StorageModule>(),
		GetDependency<neighbor::NameDbModule>());

		GetDependency<hci::AclManager>()->SetSecurityModule(this);
		}

		void SecurityModule::Stop() {