commit 70cb1637a6c7bcbefa2bb2c7a7e30742035bfe0b
author Hall Liu <hallliu@google.com> Tue Jul 25 21:35:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 21:35:20 2017 +0000
tree 2eec8c181225b3505b7f43651b56b09356c3053c
parent 4fc672a3e101006050f60a317883fbcb1aaa33de
parent 25921e8d464cf57c570b4757060daa2b41315044

Don't unmute when answering a handover connection
am: 25921e8d46

Change-Id: I797650bdb9ebd2e5d586e1de2ca52cd9cf14172e

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

diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index f778e30..5f56fcf 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -232,8 +232,10 @@
             }
         }
 
-        // Turn off mute when a new incoming call is answered.
-        mute(false /* shouldMute */);
+        // Turn off mute when a new incoming call is answered iff it's not a handover.
+        if (!call.isHandoverInProgress()) {
+            mute(false /* shouldMute */);
+        }
 
         maybeStopRingingAndCallWaitingForAnsweredOrRejectedCall(call);
     }