generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes use of AudioManager.setSpeakerphoneOn in audio manager

Browse Source 
BUG=NONE
TEST=AppRTCDemo
R=glaznev@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/51619004

Cr-Commit-Position: refs/heads/master@{#8996}
This commit is contained in:
henrika 2015-04-14 09:19:51 +02:00
parent 6739952b0f
commit 0de7bcf06a
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
View File

@ -54,7 +54,6 @@ class WebRtcAudioManager {
private int nativeSampleRate;
private int nativeChannels;
private int savedAudioMode = AudioManager.MODE_INVALID;
private boolean savedIsSpeakerPhoneOn = false;
WebRtcAudioManager(Context context, long nativeAudioManager) {
Logd("ctor" + WebRtcAudioUtils.getThreadInfo());
@ -80,11 +79,9 @@ class WebRtcAudioManager {
// Store current audio state so we can restore it when close() or
// setCommunicationMode(false) is called.
savedAudioMode = audioManager.getMode();
savedIsSpeakerPhoneOn = audioManager.isSpeakerphoneOn();
if (DEBUG) {
Logd("savedAudioMode: " + savedAudioMode);
Logd("savedIsSpeakerPhoneOn: " + savedIsSpeakerPhoneOn);
Logd("hasEarpiece: " + hasEarpiece());
}
@ -99,9 +96,8 @@ class WebRtcAudioManager {
}
// Restore previously stored audio states.
if (audioModeNeedsRestore) {
setSpeakerphoneOn(savedIsSpeakerPhoneOn);
audioManager.setMode(savedAudioMode);
}
audioManager.setMode(savedAudioMode);
}
private void setCommunicationMode(boolean enable) {
@ -143,15 +139,6 @@ class WebRtcAudioManager {
Logd("nativeChannels: " + nativeChannels);
}
/** Sets the speaker phone mode. */
private void setSpeakerphoneOn(boolean on) {
boolean wasOn = audioManager.isSpeakerphoneOn();
if (wasOn == on) {
return;
}
audioManager.setSpeakerphoneOn(on);
}
/** Gets the current earpiece state. */
private boolean hasEarpiece() {
return context.getPackageManager().hasSystemFeature(