commit a233cdb010ffcb30c574003bc353c69b9c977cc1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 27 22:07:37 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 27 22:07:37 2024 +0000
tree eb056ac7492f8fadf852311c88297926e7b665cc
parent f2239e164908ff1dc0eb892f1b236195acee7fc9
parent 03d96f08b9ff85f827b59fad3756c2b36540ba77

Merge "libaudiohal@aidl: allow ACTIVE,TRANSFERRING,DRAINING for resume" into main am: 03d96f08b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3147256

Change-Id: Ia21c3342e908e562d7c3fcd027c96bf831ce3157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index 123d4a2..38e1ea4 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -449,6 +449,11 @@
                    state == StreamDescriptor::State::TRANSFER_PAUSED ||
                    state == StreamDescriptor::State::DRAIN_PAUSED) {
             return sendCommand(makeHalCommand<HalCommand::Tag::start>(), reply);
+        } else if (state == StreamDescriptor::State::ACTIVE ||
+                   state == StreamDescriptor::State::TRANSFERRING ||
+                   state == StreamDescriptor::State::DRAINING) {
+            ALOGD("%s: already in stream state: %s", __func__, toString(state).c_str());
+            return OK;
         } else {
             ALOGE("%s: unexpected stream state: %s (expected IDLE or one of *PAUSED states)",
                         __func__, toString(state).c_str());