haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3042 from saghul/android-audiofocus 

[Android] Handle audio focus changes while in a conference
This commit is contained in:
Zoltan Bettenbuk 2018-05-29 21:29:16 +02:00 committed by GitHub
parent 7de8b96a07 ab83a97fd5
commit 455660c891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
View File

@ -57,7 +57,7 @@ import java.util.Set;
* Before a call has started and after it has ended the * Before a call has started and after it has ended the
* {@code AudioModeModule.DEFAULT} mode should be used. * {@code AudioModeModule.DEFAULT} mode should be used.
*/ */
class AudioModeModule extends ReactContextBaseJavaModule { class AudioModeModule extends ReactContextBaseJavaModule implements AudioManager.OnAudioFocusChangeListener {
/** /**
* Constants representing the audio mode. * Constants representing the audio mode.
* - DEFAULT: Used before and after every call. It represents the default * - DEFAULT: Used before and after every call. It represents the default
@ -97,6 +97,11 @@ class AudioModeModule extends ReactContextBaseJavaModule {
*/ */
static final String TAG = MODULE_NAME; static final String TAG = MODULE_NAME;
/**
* Indicator that we have lost audio focus.
*/
private boolean audioFocusLost = false;
/** /**
* {@link AudioManager} instance used to interact with the Android audio * {@link AudioManager} instance used to interact with the Android audio
* subsystem. * subsystem.
@ -345,6 +350,36 @@ class AudioModeModule extends ReactContextBaseJavaModule {
}); });
} }
/**
* {@link AudioManager.OnAudioFocusChangeListener} interface method. Called
* when the audio focus of the system is updated.
*
* @param focusChange - The type of focus change.
*/
@Override
public void onAudioFocusChange(int focusChange) {
switch (focusChange) {
case AudioManager.AUDIOFOCUS_GAIN: {
Log.d(TAG, "Audio focus gained");
// Some other application potentially stole our audio focus
// temporarily. Restore our mode.
if (audioFocusLost) {
updateAudioRoute(mode);
}
audioFocusLost = false;
break;
}
case AudioManager.AUDIOFOCUS_LOSS:
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK: {
Log.d(TAG, "Audio focus lost");
audioFocusLost = true;
break;
}
}
}
/** /**
* Sets the user selected audio device as the active audio device. * Sets the user selected audio device as the active audio device.
* *
@ -495,8 +530,9 @@ class AudioModeModule extends ReactContextBaseJavaModule {
Log.d(TAG, "Update audio route for mode: " + mode); Log.d(TAG, "Update audio route for mode: " + mode);
if (mode == DEFAULT) { if (mode == DEFAULT) {
audioFocusLost = false;
audioManager.setMode(AudioManager.MODE_NORMAL); audioManager.setMode(AudioManager.MODE_NORMAL);
audioManager.abandonAudioFocus(null); audioManager.abandonAudioFocus(this);
audioManager.setSpeakerphoneOn(false); audioManager.setSpeakerphoneOn(false);
setBluetoothAudioRoute(false); setBluetoothAudioRoute(false);
selectedDevice = null; selectedDevice = null;
@ -509,7 +545,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
audioManager.setMicrophoneMute(false); audioManager.setMicrophoneMute(false);
if (audioManager.requestAudioFocus( if (audioManager.requestAudioFocus(
null, this,
AudioManager.STREAM_VOICE_CALL, AudioManager.STREAM_VOICE_CALL,
AudioManager.AUDIOFOCUS_GAIN) AudioManager.AUDIOFOCUS_GAIN)
== AudioManager.AUDIOFOCUS_REQUEST_FAILED) { == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {