Skip to content

#721 Fix publisher negotiation race condition causing ICE timeouts #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidliu merged 1 commit into from
Nov 2, 2025
Merged

#721 Fix publisher negotiation race condition causing ICE timeouts #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/fix-publisher-negotiation-race.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"client-sdk-android": patch
---

#721 Fixed publisher negotiation race condition causing ICE timeouts.

16 changes: 15 additions & 1 deletion livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ internal constructor(
*/
private var configurationLock = Mutex()

/**
* Prevents concurrent publisher negotiations which can cause ICE gathering
* race conditions and connection failures.
*/
private val negotiatePublisherMutex = Mutex()

init {
client.listener = this
}
Expand Down Expand Up @@ -668,7 +674,15 @@ internal constructor(
hasPublished = true

coroutineScope.launch {
publisher?.negotiate?.invoke(getPublisherOfferConstraints())
if (negotiatePublisherMutex.tryLock()) {
try {
publisher?.negotiate?.invoke(getPublisherOfferConstraints())
} finally {
negotiatePublisherMutex.unlock()
}
} else {
LKLog.v { "negotiatePublisher: skipping, negotiation already in progress" }
}
}
}

Expand Down