fix(audio): Defer Bluetooth audio route changes until connection is r… #694
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
avinashmidathada
force-pushed
the
fix-bluetooth-audio-routing
branch
from
104d7b4 to
453db19
Compare
...ava/com/amazonaws/services/chime/sdk/meetings/internal/audio/DefaultAudioClientController.kt
Show resolved
Hide resolved
amazon-chime-sdk/src/main/java/com/amazonaws/services/chime/sdk/meetings/device/MediaDevice.kt
Show resolved
Hide resolved
| * @param state The new SCO audio state | ||
| * @param previousState The previous SCO audio state | ||
| */ | ||
| private fun onScoStateChanged(state: Int, previousState: Int) { |
Contributor
There was a problem hiding this comment.
It's hard for me to gauge, but is there any way to break this logic out and if so, whether it could be an interface with two implementations? Understandable if not possible.
Author
There was a problem hiding this comment.
Yeah it kinda grew to a big chunk without me realizing as we're supporting two APIs. The callback logic makes it a bit tricky to cleanly extract this out but I can give it a shot and get back
dylonChime
previously approved these changes
Dec 11, 2025
avinashmidathada
force-pushed
the
fix-bluetooth-audio-routing
branch
2 times, most recently
from
1d24b0f to
1332a57
Compare
…eady When switching to a Bluetooth audio device, the SDK was changing the audio route before the Bluetooth connection was established. This caused a race condition where Android would reject Bluetooth routing and fall back to Handset. This fix introduces the BluetoothAudioRouter abstraction to encapsulate Bluetooth connection management. The router defers route changes until the Bluetooth connection is confirmed ready, with implementations selected via BluetoothAudioRouterFactory based on API level. This design isolates the complex asynchronous Bluetooth handling from DefaultDeviceController and allows each platform path to be tested independently. ScoBluetoothAudioRouter (API < 31): - Monitor ACTION_SCO_AUDIO_STATE_UPDATED broadcasts for connection state - Execute deferred setRoute() only when SCO reaches CONNECTED state - Handle SCO connection failures and timeouts (3 seconds) - Distinguish connection failure from device switching for multi-device support CommunicationDeviceBluetoothAudioRouter (API 31+): - Use OnCommunicationDeviceChangedListener for connection confirmation - Retry on mismatch when setCommunicationDevice() succeeds but listener reports a different device (500ms delay, max 3 retries) - 5-second timeout for device switching per Android documentation Additional changes: - Update MediaDevice to track device IDs for API 31+ routing - Add test coverage for both API paths
avinashmidathada
force-pushed
the
fix-bluetooth-audio-routing
branch
from
1332a57 to
013f631
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ℹ️ Description
When switching to a Bluetooth audio device, the SDK was changing the audio
route before the Bluetooth connection was established. This caused a race
condition where Android would reject Bluetooth routing and fall back to
Handset.
This fix introduces the BluetoothAudioRouter abstraction to encapsulate Bluetooth
connection management. The router defers route changes until the Bluetooth
connection is confirmed ready, with implementations selected via
BluetoothAudioRouterFactory based on API level. This design isolates the
complex asynchronous Bluetooth handling from DefaultDeviceController and
allows each platform path to be tested independently.
ScoBluetoothAudioRouter (API < 31):
CommunicationDeviceBluetoothAudioRouter (API 31+):
reports a different device (500ms delay, max 3 retries)
Additional changes:
Issue #, if available
Type of change
🧪 How Has This Been Tested?
Manually verified with a Pixel 8 device running Android
Unit test coverage
Added comprehensive unit tests
Additional Manual Test
📱 Screenshots, if available
provide screenshots/video record if there's a UI change in demo app
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.