commit a518e5166d5f60780a8b6625f5130bb1ee2ec1ee
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 28 19:33:52 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 28 19:33:52 2014 -0700
tree 9d294d988975f41e672d4c2ee631933b0e87c0ab
parent 2bd2c9e6e2ba564c69cfacebaba028818d6b1cf2
parent 16ff4f86f2903ce96b304e0b0724cac53d181c74

Merge "hal: Add support for multiple instances of offload playback"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 86440b8..cf86cc8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -352,13 +352,16 @@
     } else {
         ALOGV("%s: snd_device(%d: %s)", __func__,
         snd_device, device_name);
+        /* due to the possibility of calibration overwrite between listen
+            and audio, notify listen hal before audio calibration is sent */
+        audio_extn_listen_update_status(snd_device,
+                       LISTEN_EVENT_SND_DEVICE_BUSY);
         if (platform_send_audio_calibration(adev->platform, snd_device) < 0) {
             adev->snd_dev_ref_cnt[snd_device]--;
+            audio_extn_listen_update_status(snd_device,
+                           LISTEN_EVENT_SND_DEVICE_FREE);
             return -EINVAL;
         }
-        audio_extn_listen_update_status(snd_device,
-                LISTEN_EVENT_SND_DEVICE_BUSY);
-
         audio_route_apply_path(adev->audio_route, device_name);
     }
     if (update_mixer)