Fix a race condition inside command_timed_out() when printing log info (3f583f18) · Commits · e / os / android_packages_modules_Bluetooth

system/hci/src/hci_layer.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,7 +396,6 @@ static void command_timed_out(UNUSED_ATTR void* context) {
		} else {
		waiting_command_t* wait_entry = reinterpret_cast<waiting_command_t*>(
		list_front(commands_pending_response));
		lock.unlock();

		// We shouldn't try to recover the stack from this command timeout.
		// If it's caused by a software bug, fix it. If it's a hardware bug, fix it.
		@@ -405,6 +404,7 @@ static void command_timed_out(UNUSED_ATTR void* context) {
		"%s hci layer timeout waiting for response to a command. opcode: 0x%x",
		__func__, wait_entry->opcode);
		LOG_EVENT_INT(BT_HCI_TIMEOUT_TAG_NUM, wait_entry->opcode);
		lock.unlock();
		}

		LOG_ERROR(LOG_TAG, "%s restarting the bluetooth process.", __func__);