From 0de7bcf06abb6c8342c273a8000abe9f46dfe184 Mon Sep 17 00:00:00 2001
From: henrika <henrika@chromium.org>
Date: Tue, 14 Apr 2015 09:19:51 +0200
Subject: [PATCH] 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}
---
 .../webrtc/voiceengine/WebRtcAudioManager.java    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

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 f116900da7..562cd16dd7 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 @@ 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(