commit 2e6152cba706a46f81f291d43804fb838d73c45c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 25 23:18:03 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 23:18:03 2017 +0000
tree 257bf5729970b9b3cfb52351a18cbd0febe54965
parent f3f2280b63960c1b588f1af69ade9cb3ffece8a0
parent 58575673fff1e9dff97785ae230a63bb070eafa7

Merge "Import translations. DO NOT MERGE"

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);
     }