commit 2a70f594de316b72af9cbbcda8adfcadc33bf4da
author Ravi Kumar Alamanda <ralama@codeaurora.org> Thu Sep 03 05:57:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 05:57:53 2015 +0000
tree 20f014e6e64f66e06fbf9749545d50b6ddf045e1
parent cc64df8ed2804c204bfb3c6202498755835336d6
parent 5a95ff689b4a1827488d576f02b6292e4318abb2

am 5a95ff68: hal: Fix incorrect audio calibration after device switch

* commit '5a95ff689b4a1827488d576f02b6292e4318abb2':
  hal: Fix incorrect audio calibration after device switch

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 70ce0dc..86072c0 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -308,6 +308,8 @@
         return -EINVAL;
     }
 
+    platform_send_audio_calibration(adev->platform, snd_device);
+
     adev->snd_dev_ref_cnt[snd_device]++;
     if (adev->snd_dev_ref_cnt[snd_device] > 1) {
         ALOGV("%s: snd_device(%d: %s) is already active",
@@ -323,13 +325,6 @@
     if (audio_extn_spkr_prot_is_enabled())
          audio_extn_spkr_prot_calib_cancel(adev);
 
-    if (platform_send_audio_calibration(adev->platform, snd_device) < 0) {
-        adev->snd_dev_ref_cnt[snd_device]--;
-        audio_extn_sound_trigger_update_device_status(snd_device,
-                                    ST_EVENT_SND_DEVICE_FREE);
-        return -EINVAL;
-    }
-
     audio_extn_dsm_feedback_enable(adev, snd_device, true);
 
     if ((snd_device == SND_DEVICE_OUT_SPEAKER ||