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

Utilize exclusive AudioFocus.

Browse source
This commit is contained in:
Alex Hart 2020-05-29 12:35:42 -03:00 • committed by Greyson Parrelli
parent 9da309ca48
commit 2ddd1437cf
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
View file

@ -17,8 +17,15 @@ public abstract class AudioManagerCompat {
private static final String TAG = Log.tag(AudioManagerCompat.class); private static final String TAG = Log.tag(AudioManagerCompat.class);
private static final int AUDIOFOCUS_GAIN = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE;
protected final AudioManager audioManager; protected final AudioManager audioManager;
@SuppressWarnings("CodeBlock2Expr")
protected final AudioManager.OnAudioFocusChangeListener onAudioFocusChangeListener = focusChange -> {
Log.i(TAG, "onAudioFocusChangeListener: " + focusChange);
};
private AudioManagerCompat(@NonNull Context context) { private AudioManagerCompat(@NonNull Context context) {
audioManager = ServiceUtil.getAudioManager(context); audioManager = ServiceUtil.getAudioManager(context);
} }
@ -66,8 +73,9 @@ public abstract class AudioManagerCompat {
return; return;
} }
audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT) audioFocusRequest = new AudioFocusRequest.Builder(AUDIOFOCUS_GAIN)
.setAudioAttributes(AUDIO_ATTRIBUTES) .setAudioAttributes(AUDIO_ATTRIBUTES)
.setOnAudioFocusChangeListener(onAudioFocusChangeListener)
.build(); .build();
int result = audioManager.requestAudioFocus(audioFocusRequest); int result = audioManager.requestAudioFocus(audioFocusRequest);
@ -129,7 +137,7 @@ public abstract class AudioManagerCompat {
@Override @Override
public void requestCallAudioFocus() { public void requestCallAudioFocus() {
int result = audioManager.requestAudioFocus(null, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT); int result = audioManager.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_VOICE_CALL, AUDIOFOCUS_GAIN);
if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) { if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
Log.w(TAG, "Audio focus not granted. Result code: " + result); Log.w(TAG, "Audio focus not granted. Result code: " + result);
@ -138,7 +146,7 @@ public abstract class AudioManagerCompat {
@Override @Override
public void abandonCallAudioFocus() { public void abandonCallAudioFocus() {
int result = audioManager.abandonAudioFocus(null); int result = audioManager.abandonAudioFocus(onAudioFocusChangeListener);
if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) { if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
Log.w(TAG, "Audio focus abandon failed. Result code: " + result); Log.w(TAG, "Audio focus abandon failed. Result code: " + result);