Fix race condition in PeerConnectionTransport.trackBitrates

adrian-niculescu · adrian-niculescu · commit e16141d4758d · 2025-11-25T00:30:03.000+02:00
diff --git a/.changeset/fix-track-bitrates-race-condition.md b/.changeset/fix-track-bitrates-race-condition.md
@@ -0,0 +1,5 @@
+---
+"client-sdk-android": patch
+---
+
+Fixed race condition in `PeerConnectionTransport.trackBitrates` by ensuring writes happen on the RTC thread.
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/room/PeerConnectionTransport.kt b/livekit-android-sdk/src/main/java/io/livekit/android/room/PeerConnectionTransport.kt
@@ -318,11 +318,15 @@ constructor(
     }
 
     fun registerTrackBitrateInfo(cid: String, trackBitrateInfo: TrackBitrateInfo) {
-        trackBitrates[TrackBitrateInfoKey.Cid(cid)] = trackBitrateInfo
+        executeRTCIfNotClosed {
+            trackBitrates[TrackBitrateInfoKey.Cid(cid)] = trackBitrateInfo
+        }
     }
 
     fun registerTrackBitrateInfo(transceiver: RtpTransceiver, trackBitrateInfo: TrackBitrateInfo) {
-        trackBitrates[TrackBitrateInfoKey.Transceiver(transceiver)] = trackBitrateInfo
+        executeRTCIfNotClosed {
+            trackBitrates[TrackBitrateInfoKey.Transceiver(transceiver)] = trackBitrateInfo
+        }
     }
 
     suspend fun isConnected(): Boolean {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"client-sdk-android": patch
 +---
++
 +Fixed race condition in `PeerConnectionTransport.trackBitrates` by ensuring writes happen on the RTC thread.
Original file line number	Diff line number	Diff line change
`@@ -318,11 +318,15 @@ constructor(`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`fun registerTrackBitrateInfo(cid: String, trackBitrateInfo: TrackBitrateInfo) {`
`321`		`- trackBitrates[TrackBitrateInfoKey.Cid(cid)] = trackBitrateInfo`
	`321`	`+ executeRTCIfNotClosed {`
	`322`	`+ trackBitrates[TrackBitrateInfoKey.Cid(cid)] = trackBitrateInfo`
	`323`	`+ }`
`322`	`324`	`}`
`323`	`325`
`324`	`326`	`fun registerTrackBitrateInfo(transceiver: RtpTransceiver, trackBitrateInfo: TrackBitrateInfo) {`
`325`		`- trackBitrates[TrackBitrateInfoKey.Transceiver(transceiver)] = trackBitrateInfo`
	`327`	`+ executeRTCIfNotClosed {`
	`328`	`+ trackBitrates[TrackBitrateInfoKey.Transceiver(transceiver)] = trackBitrateInfo`
	`329`	`+ }`
`326`	`330`	`}`
`327`	`331`
`328`	`332`	`suspend fun isConnected(): Boolean {`