Skip to content

fix(audio): clear audioSwitch synchronously in AudioSwitchHandler.stop() #967

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
Jun 17, 2026
+17 −2
Merged

fix(audio): clear audioSwitch synchronously in AudioSwitchHandler.stop() #967

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
5 changes: 5 additions & 0 deletions .changeset/audioswitch-stale-switch-on-restart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"client-sdk-android": patch
---

Fix audio output getting stuck on the earpiece after reconnecting on a reused `Room` (Android 12+). `AudioSwitchHandler.stop()` now clears its `audioSwitch` reference synchronously (and the field is `@Volatile`) so a subsequent `start()` reliably observes the teardown and re-creates the switch, instead of racing the posted teardown runnable and reusing a stale, already-stopped switch.
14 changes: 12 additions & 2 deletions livekit-android-sdk/src/main/java/io/livekit/android/audio/AudioSwitchHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ constructor(private val context: Context) : AudioHandler {
*/
var forceHandleAudioRouting = false

// Volatile and nulled synchronously in stop() (rather than only inside the posted
// teardown runnable) so that a subsequent start() reliably observes the teardown.
@Volatile
private var audioSwitch: AbstractAudioSwitch? = null

// AudioSwitch is not threadsafe, so all calls should be done through a single thread.
Expand Down Expand Up @@ -261,10 +264,17 @@ constructor(private val context: Context) : AudioHandler {

@Synchronized
override fun stop() {
// Null audioSwitch synchronously (under the lock) so a subsequent start() reliably
// observes the teardown and re-creates the switch. Previously it was nulled inside the
// posted runnable on the handler thread; with handler/thread torn down synchronously
// below, a fast start() could read a stale, already-stopped switch and skip re-creation,
// leaving audio routing broken (e.g. stuck on the earpiece) until the next connect.
// The switch's stop() is still posted, since AbstractAudioSwitch is not threadsafe.
val switchToStop = audioSwitch
audioSwitch = null
handler?.removeCallbacksAndMessages(null)
handler?.postAtFrontOfQueue {
audioSwitch?.stop()
audioSwitch = null
switchToStop?.stop()
}
thread?.quitSafely()

Expand Down