commit 25deb083f0fbebcd77e2dfd7a5bc8acde0a1f345
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 14 02:48:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 02:48:47 2017 +0000
tree 7987543950c4e5ad01c020d6ba54b98f7e36071f
parent 7aa29e3493aa009ab826219ff9fccae09c96a9d2
parent 01cf84d0225f25f26d6ef4d349c0c6b8cd722542

Merge "Move audio-perf to HAL module"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 85c886b..dba1555 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3446,6 +3446,14 @@
     int ret = -ENOSYS;
 
     lock_input_stream(in);
+    // note: ST sessions do not close the alsa pcm driver synchronously
+    // on standby. Therefore, we may return an error even though the
+    // pcm stream is still opened.
+    if (in->standby) {
+        ALOGE_IF(in->pcm != NULL && !in->is_st_session,
+                 "%s stream in standby but pcm not NULL for non ST session", __func__);
+        goto exit;
+    }
     if (in->pcm) {
         struct timespec timestamp;
         unsigned int avail;
@@ -3455,6 +3463,7 @@
             ret = 0;
         }
     }
+exit:
     pthread_mutex_unlock(&in->lock);
     return ret;
 }