commit ea0aab94ac19c32aa43376c89dc22f1e9f96d8bc
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 24 19:22:05 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 24 19:22:05 2018 -0700
tree a8fc52609f1ef5cb26a11fc844c353b796ca8c73
parent cf6ccc7ce93ec15a32f2b45a530e68990a909d41
parent fd02a2fbb154dbea7425ce3bf6070725ad6c7588

Merge "hal: Fix compressed offload SSR resume"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 225a03e..3802a77 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3563,6 +3563,7 @@
 static int out_on_error(struct audio_stream *stream)
 {
     struct stream_out *out = (struct stream_out *)stream;
+    int status = 0;
 
     lock_output_stream(out);
     // always send CMD_ERROR for offload streams, this
@@ -3570,11 +3571,18 @@
     // since the stream is active, offload_callback_thread is also active.
     if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
         stop_compressed_output_l(out);
+    }
+    pthread_mutex_unlock(&out->lock);
+
+    status = out_standby(&out->stream.common);
+
+    lock_output_stream(out);
+    if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
         send_offload_cmd_l(out, OFFLOAD_CMD_ERROR);
     }
     pthread_mutex_unlock(&out->lock);
 
-    return out_standby(&out->stream.common);
+    return status;
 }
 
 /*