commit 012b02b8ed083d515f33ecb49c20d98a50045d60
author gitbuildkicker <android-build@google.com> Thu Aug 04 01:06:20 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Aug 04 01:06:20 2016 -0700
tree fb50db98e12c58353074249c0351494da421bdaa
parent 12d06d04314f1b192802783b04ac392ff96fdaf7
parent 0fc1b3b13ed5f2a54a62bd7c429d54abbeae4e64

merge in nyc-mr1-release history after reset to nyc-mr1-dev

hal/voice.c

diff --git a/hal/voice.c b/hal/voice.c
index f3250c9..d2215b6 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -124,10 +124,8 @@
     session->state.current = CALL_INACTIVE;
 
     /* Disable sidetone only when no calls are active */
-    if (!voice_is_call_state_active(adev)) {
-        adev->voice.in_call = false;
+    if (!voice_is_call_state_active(adev))
         voice_set_sidetone(adev, uc_info->out_snd_device, false);
-    }
 
     ret = platform_stop_voice_call(adev->platform, session->vsid);