commit 03d96f08b9ff85f827b59fad3756c2b36540ba77
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 27 21:51:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 27 21:51:06 2024 +0000
tree 0be92c8d43917764cec69ff3753f0fd59448015a
parent ddc2de8f46eca9265adc02e3f8c9dfd2b85a6ff7
parent 9807247ac11aa9a4e9d05b94e5ceaf3cc43d4bb0

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

media/libaudiohal/impl/StreamHalAidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index 12a8019..fb4b549 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -445,6 +445,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());