Properly shim controller flags am: 45f35ebdda (0cb860fa) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/controller.cc

+2 −4

Original line number	Diff line number	Diff line
		@@ -35,10 +35,8 @@ struct Controller::impl {
		void Start(hci::HciLayer* hci) {
		hci_ = hci;
		Handler* handler = module_.GetHandler();
		if (bluetooth::common::InitFlags::GdCoreEnabled()) {
		hci_->RegisterEventHandler(
		EventCode::NUMBER_OF_COMPLETED_PACKETS, handler->BindOn(this, &Controller::impl::NumberOfCompletedPackets));
		}

		le_set_event_mask(kDefaultLeEventMask);
		set_event_mask(kDefaultEventMask);

+12 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,16 @@ static bool event_already_registered_in_hci_layer(
		}
		}

		static bool event_already_registered_in_controller_layer(
		bluetooth::hci::EventCode event_code) {
		switch (event_code) {
		case bluetooth::hci::EventCode::NUMBER_OF_COMPLETED_PACKETS:
		return bluetooth::shim::is_gd_controller_enabled();
		default:
		return false;
		}
		}

		static bool event_already_registered_in_acl_layer(
		bluetooth::hci::EventCode event_code) {
		for (auto event : bluetooth::hci::AclConnectionEvents) {
		@@ -533,6 +543,8 @@ void bluetooth::shim::hci_on_reset_complete() {
		auto event_code = static_cast<bluetooth::hci::EventCode>(event_code_raw);
		if (event_already_registered_in_acl_layer(event_code)) {
		continue;
		} else if (event_already_registered_in_controller_layer(event_code)) {
		continue;
		} else if (event_already_registered_in_hci_layer(event_code)) {
		continue;
		} else if (event_already_registered_in_le_advertising_manager(event_code)) {