Merge "floss: Skip on_hci_timeout" into main (dc25a69d) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/hci_layer.cc

+10 −10

Original line number	Diff line number	Diff line
		@@ -294,6 +294,16 @@ struct HciLayer::impl {
		}

		void on_hci_timeout(OpCode op_code) {
		#ifdef TARGET_FLOSS
		log::warn("Ignoring the timeouted HCI command {}.", OpCodeText(op_code));
		// Terminate the process to trigger controller reset, also mark the controller
		// is broken to prevent further error while terminating.
		auto hal = module_.GetDependency<hal::HciHal>();
		hal->markControllerBroken();
		kill(getpid(), SIGTERM);
		return;
		#endif

		common::StopWatch::DumpStopWatchLog();
		log::error("Timed out waiting for {} for {}ms", OpCodeText(op_code), getHciTimeoutMs().count());

		@@ -305,16 +315,6 @@ struct HciLayer::impl {
		command_credits_ = 1;
		waiting_command_ = OpCode::NONE;

		#ifdef TARGET_FLOSS
		log::warn("Ignoring the timeouted HCI command {}.", OpCodeText(op_code));
		// Terminate the process to trigger controller reset, also mark the controller
		// is broken to prevent further error while terminating.
		auto hal = module_.GetDependency<hal::HciHal>();
		hal->markControllerBroken();
		kill(getpid(), SIGTERM);
		return;
		#endif

		// Ignore the response, since we don't know what might come back.
		enqueue_command(ControllerDebugInfoBuilder::Create(),
		module_.GetHandler()->BindOnce([](CommandCompleteView) {}));