Removes use of AudioManager.setSpeakerphoneOn in audio manager
BUG=NONE
TEST=AppRTCDemo
R=glaznev@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/51619004
Cr-Commit-Position: refs/heads/master@{#8996}
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
index f116900..562cd16 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
@@ -54,7 +54,6 @@
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 @@
// 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 @@
}
// Restore previously stored audio states.
if (audioModeNeedsRestore) {
- setSpeakerphoneOn(savedIsSpeakerPhoneOn);
+ audioManager.setMode(savedAudioMode);
}
- audioManager.setMode(savedAudioMode);
}
private void setCommunicationMode(boolean enable) {
@@ -143,15 +139,6 @@
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(
