empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update volume output stream when audioAttributes change.

Browse source
This commit is contained in:
Alex Hart 2022-03-04 12:59:10 -04:00
parent 4b23e60dd6
commit eae6a971e6
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
View file

@ -109,7 +109,6 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
public void onResume(@NonNull LifecycleOwner owner) { public void onResume(@NonNull LifecycleOwner owner) {
mediaBrowser.disconnect(); mediaBrowser.disconnect();
mediaBrowser.connect(); mediaBrowser.connect();
activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);
} }
@Override @Override

14
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
View file

@ -24,6 +24,7 @@ import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.PlaybackException;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
import com.google.android.exoplayer2.ui.PlayerNotificationManager; import com.google.android.exoplayer2.ui.PlayerNotificationManager;
@ -204,6 +205,19 @@ public class VoiceNotePlaybackService extends MediaBrowserServiceCompat {
public void onPlayerError(@NonNull PlaybackException error) { public void onPlayerError(@NonNull PlaybackException error) {
Log.w(TAG, "ExoPlayer error occurred:", error); Log.w(TAG, "ExoPlayer error occurred:", error);
} }
@Override
public void onAudioAttributesChanged(AudioAttributes audioAttributes) {
final int stream;
if (audioAttributes.usage == C.USAGE_VOICE_COMMUNICATION) {
stream = AudioManager.STREAM_VOICE_CALL;
} else {
stream = AudioManager.STREAM_MUSIC;
}
Log.i(TAG, "onAudioAttributesChanged: Setting audio stream to " + stream);
mediaSession.setPlaybackToLocal(stream);
}
} }
private @Nullable PlaybackParameters getPlaybackParametersForWindowPosition(int currentWindowIndex) { private @Nullable PlaybackParameters getPlaybackParametersForWindowPosition(int currentWindowIndex) {