commit 4df0e9b99c1457d5e922fde9b5cb98b5b305e094
author Santos Cordon <santoscordon@google.com> Thu Apr 16 17:58:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 16 17:58:53 2015 +0000
tree 1d847ace0d2f0db58c99ae3844058e6f22265e5d
parent 4a414e88c32aa39a749733abe2816769836e8b99
parent d6782cdb82bf1d235dfb164cce6db3c8a5629720

Merge "Turn speakerphone on at DIALING state."

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 5fd4fca..0d57c8a 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -916,14 +916,12 @@
 
     void markCallAsDialing(Call call) {
         setCallState(call, CallState.DIALING);
+        maybeMoveToSpeakerPhone(call);
     }
 
     void markCallAsActive(Call call) {
         setCallState(call, CallState.ACTIVE);
-
-        if (call.getStartWithSpeakerphoneOn()) {
-            setAudioRoute(AudioState.ROUTE_SPEAKER);
-        }
+        maybeMoveToSpeakerPhone(call);
     }
 
     void markCallAsOnHold(Call call) {
@@ -1457,6 +1455,16 @@
     }
 
     /**
+     * Checks to see if the call should be on speakerphone and if so, set it.
+     */
+    private void maybeMoveToSpeakerPhone(Call call) {
+        if (call.getStartWithSpeakerphoneOn()) {
+            setAudioRoute(AudioState.ROUTE_SPEAKER);
+            call.setStartWithSpeakerphoneOn(false);
+        }
+    }
+
+    /**
      * Creates a new call for an existing connection.
      *
      * @param callId The id of the new call.