commit | ad8a4f7e424abf7ca43fc060458f9204a9f15a69 | [log] [tgz] |
---|---|---|
author | Mikhail Naganov <mnaganov@google.com> | Fri Oct 11 22:59:24 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 11 22:59:24 2024 +0000 |
tree | 3ce775b7fe016543e67dd8f743daa5ed7a43ecd2 | |
parent | 02131b53858f9854b0bf141a783e89a75922aa95 [diff] | |
parent | 05fc6aa383649152c6ea223c21d8ff7e643aa0fc [diff] |
audio: Fix AudioRecordTest#testTimestamp CTS on CF am: 05fc6aa383 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3304742 Change-Id: I44167196ec1b8a75653e15514192584bd26d4cbd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/primary/StreamPrimary.cpp b/audio/aidl/default/primary/StreamPrimary.cpp index 1176d05..c1c1f03 100644 --- a/audio/aidl/default/primary/StreamPrimary.cpp +++ b/audio/aidl/default/primary/StreamPrimary.cpp
@@ -56,7 +56,9 @@ } ::android::status_t StreamPrimary::flush() { - return isStubStreamOnWorker() ? mStubDriver.flush() : StreamAlsa::flush(); + RETURN_STATUS_IF_ERROR(isStubStreamOnWorker() ? mStubDriver.flush() : StreamAlsa::flush()); + // TODO(b/372951987): consider if this needs to be done from 'StreamInWorkerLogic::cycle'. + return mIsInput ? standby() : ::android::OK; } ::android::status_t StreamPrimary::pause() {