sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return audio mode to normal (instead of previous mode) after call ended

This commit is contained in:
Daniel Gultsch 2020-05-20 19:40:26 +02:00
parent bfeebc141f
commit 304411fc09
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/eu/siacs/conversations/services/AppRTCAudioManager.java
View File

@ -51,7 +51,6 @@ public class AppRTCAudioManager {
@Nullable @Nullable
private AudioManagerEvents audioManagerEvents; private AudioManagerEvents audioManagerEvents;
private AudioManagerState amState; private AudioManagerState amState;
private int savedAudioMode = AudioManager.MODE_INVALID;
private boolean savedIsSpeakerPhoneOn; private boolean savedIsSpeakerPhoneOn;
private boolean savedIsMicrophoneMute; private boolean savedIsMicrophoneMute;
private boolean hasWiredHeadset; private boolean hasWiredHeadset;
@ -178,21 +177,17 @@ public class AppRTCAudioManager {
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
// TODO(henrika): audioManager.requestAudioFocus() is deprecated.
public void start(AudioManagerEvents audioManagerEvents) { public void start(AudioManagerEvents audioManagerEvents) {
Log.d(Config.LOGTAG, "start"); Log.d(Config.LOGTAG, AppRTCAudioManager.class.getName() + ".start()");
ThreadUtils.checkIsOnMainThread(); ThreadUtils.checkIsOnMainThread();
if (amState == AudioManagerState.RUNNING) { if (amState == AudioManagerState.RUNNING) {
Log.e(Config.LOGTAG, "AudioManager is already active"); Log.e(Config.LOGTAG, "AudioManager is already active");
return; return;
} }
awaitMicrophoneLatch(); awaitMicrophoneLatch();
// TODO(henrika): perhaps call new method called preInitAudio() here if UNINITIALIZED.
Log.d(Config.LOGTAG, "AudioManager starts...");
this.audioManagerEvents = audioManagerEvents; this.audioManagerEvents = audioManagerEvents;
amState = AudioManagerState.RUNNING; amState = AudioManagerState.RUNNING;
// Store current audio state so we can restore it when stop() is called. // Store current audio state so we can restore it when stop() is called.
savedAudioMode = audioManager.getMode();
savedIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn(); savedIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn();
savedIsMicrophoneMute = audioManager.isMicrophoneMute(); savedIsMicrophoneMute = audioManager.isMicrophoneMute();
hasWiredHeadset = hasWiredHeadset(); hasWiredHeadset = hasWiredHeadset();
@ -280,9 +275,8 @@ public class AppRTCAudioManager {
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
// TODO(henrika): audioManager.abandonAudioFocus() is deprecated.
public void stop() { public void stop() {
Log.d(Config.LOGTAG, "stop"); Log.d(Config.LOGTAG, AppRTCAudioManager.class.getName() + ".stop()");
ThreadUtils.checkIsOnMainThread(); ThreadUtils.checkIsOnMainThread();
if (amState != AudioManagerState.RUNNING) { if (amState != AudioManagerState.RUNNING) {
Log.e(Config.LOGTAG, "Trying to stop AudioManager in incorrect state: " + amState); Log.e(Config.LOGTAG, "Trying to stop AudioManager in incorrect state: " + amState);
@ -294,7 +288,7 @@ public class AppRTCAudioManager {
// Restore previously stored audio states. // Restore previously stored audio states.
setSpeakerphoneOn(savedIsSpeakerPhoneOn); setSpeakerphoneOn(savedIsSpeakerPhoneOn);
setMicrophoneMute(savedIsMicrophoneMute); setMicrophoneMute(savedIsMicrophoneMute);
audioManager.setMode(savedAudioMode); audioManager.setMode(AudioManager.MODE_NORMAL);
// Abandon audio focus. Gives the previous focus owner, if any, focus. // Abandon audio focus. Gives the previous focus owner, if any, focus.
audioManager.abandonAudioFocus(audioFocusChangeListener); audioManager.abandonAudioFocus(audioFocusChangeListener);
audioFocusChangeListener = null; audioFocusChangeListener = null;
@ -304,7 +298,6 @@ public class AppRTCAudioManager {
proximitySensor = null; proximitySensor = null;
} }
audioManagerEvents = null; audioManagerEvents = null;
Log.d(Config.LOGTAG, "AudioManager stopped");
} }
/** /**
@ -318,11 +311,7 @@ public class AppRTCAudioManager {
setSpeakerphoneOn(true); setSpeakerphoneOn(true);
break; break;
case EARPIECE: case EARPIECE:
setSpeakerphoneOn(false);
break;
case WIRED_HEADSET: case WIRED_HEADSET:
setSpeakerphoneOn(false);
break;
case BLUETOOTH: case BLUETOOTH:
setSpeakerphoneOn(false); setSpeakerphoneOn(false);
break; break;