commit 2afccbf06669103ef100c6f68470442acee22dc2
author Linux Build Service Account <lnxbuild@localhost> Thu Jan 30 03:55:26 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 30 03:55:26 2014 -0800
tree 32aa222e58cb7a3a2dd9b55b977ef7ddc54ad900
parent 8471917395bb21c1862608d8e7df1a01cd06cca1
parent 0fe78f0b597f66f0df4daa982a6dd9e13786b062

Merge "hal : Send drain to the driver if next track returns error"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index dc7f844..1b008db 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -882,6 +882,7 @@
 {
     struct stream_out *out = (struct stream_out *) context;
     struct listnode *item;
+    int ret = 0;
 
     setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_AUDIO);
     set_sched_policy(0, SP_FOREGROUND);
@@ -931,8 +932,14 @@
             event = STREAM_CBK_EVENT_WRITE_READY;
             break;
         case OFFLOAD_CMD_PARTIAL_DRAIN:
-            compress_next_track(out->compr);
-            compress_partial_drain(out->compr);
+            ret = compress_next_track(out->compr);
+            if(ret == 0)
+                compress_partial_drain(out->compr);
+            else if(ret == -ETIMEDOUT)
+                compress_drain(out->compr);
+            else
+                ALOGE("%s: Next track returned error %d",__func__, ret);
+
             send_callback = true;
             event = STREAM_CBK_EVENT_DRAIN_READY;
             break;