commit 18f843be394158cc564c06d4e1844cfec36ea3ed
author Brad Ebinger <breadley@google.com> Thu Mar 09 21:38:59 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 09 21:39:00 2017 +0000
tree ad625c35559761b466955234d90cc32935364723
parent db10aec6374e4dcc7578f51636718ffb4f2b2219
parent fac1dba0e2c508afe197994ec831adf6229cee86

Merge "Disable a phone number log for user build"

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

diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index efd0721..8f3aefe 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -1529,7 +1529,15 @@
     }
 
     private int calculateBaselineRouteMessage(boolean isExplicitUserRequest) {
-        if ((mAvailableRoutes & ROUTE_EARPIECE) != 0) {
+        boolean isSkipEarpiece = false;
+        if (!isExplicitUserRequest) {
+            synchronized (mLock) {
+                // Check video calls to skip earpiece since the baseline for video
+                // calls should be the speakerphone route
+                isSkipEarpiece = mCallsManager.hasVideoCall();
+            }
+        }
+        if ((mAvailableRoutes & ROUTE_EARPIECE) != 0 && !isSkipEarpiece) {
             return isExplicitUserRequest ? USER_SWITCH_EARPIECE : SWITCH_EARPIECE;
         } else if ((mAvailableRoutes & ROUTE_WIRED_HEADSET) != 0) {
             return isExplicitUserRequest ? USER_SWITCH_HEADSET : SWITCH_HEADSET;