Skip to content

fix: reapply android audio config after audio changes to ensure custom configuration is maintained #62

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

Open
Brazol wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: reapply android audio config after audio changes to ensure custom configuration is maintained #62

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
31 changes: 30 additions & 1 deletion android/src/main/java/io/getstream/webrtc/flutter/audio/AudioSwitchManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ public void start() {
if (!isActive) {
audioSwitch.activate();
isActive = true;

reapplyAudioConfiguration();
}
});
}
Expand Down Expand Up @@ -204,6 +206,7 @@ public void selectAudioOutput(@NonNull Class<? extends AudioDevice> audioDeviceC
}
if (audioDevice != null) {
Objects.requireNonNull(audioSwitch).selectDevice(audioDevice);
reapplyAudioConfiguration();
}
});
}
Expand Down Expand Up @@ -248,6 +251,7 @@ public void enableSpeakerphone(boolean enable) {
} else {
handler.post(() -> {
Objects.requireNonNull(audioSwitch).selectDevice(null);
reapplyAudioConfiguration();
});
}
}
Expand Down Expand Up @@ -407,6 +411,24 @@ private void applyAudioManagerSettings() {
audioManager.setMode(audioMode);
}

private void reapplyAudioConfiguration() {
if (audioSwitch == null) {
return;
}

handler.post(() -> {
Objects.requireNonNull(audioSwitch).setManageAudioFocus(manageAudioFocus);
Objects.requireNonNull(audioSwitch).setFocusMode(focusMode);
Objects.requireNonNull(audioSwitch).setAudioMode(audioMode);
Objects.requireNonNull(audioSwitch).setAudioStreamType(audioStreamType);
Objects.requireNonNull(audioSwitch).setAudioAttributeContentType(audioAttributeContentType);
Objects.requireNonNull(audioSwitch).setAudioAttributeUsageType(audioAttributeUsageType);
Objects.requireNonNull(audioSwitch).setForceHandleAudioRouting(forceHandleAudioRouting);

applyAudioManagerSettings();
});
}

public void clearCommunicationDevice() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
audioManager.clearCommunicationDevice();
Expand All @@ -421,11 +443,12 @@ public void requestAudioFocus() {
handler.post(() -> {
if (audioSwitch != null) {
Objects.requireNonNull(audioSwitch).activate();
reapplyAudioConfiguration();
}
});
}

private static final class ForwardingAudioFocusChangeListener implements AudioManager.OnAudioFocusChangeListener {
private final class ForwardingAudioFocusChangeListener implements AudioManager.OnAudioFocusChangeListener {
@Nullable
private volatile AudioManager.OnAudioFocusChangeListener delegate;

Expand All @@ -435,6 +458,12 @@ public void onAudioFocusChange(int focusChange) {
if (current != null) {
current.onAudioFocusChange(focusChange);
}

if (focusChange == AudioManager.AUDIOFOCUS_GAIN ||
focusChange == AudioManager.AUDIOFOCUS_GAIN_TRANSIENT ||
focusChange == AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK) {
reapplyAudioConfiguration();
}
}

void setDelegate(@Nullable AudioManager.OnAudioFocusChangeListener delegate) {
Expand Down
Loading