diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-29 19:50:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 19:50:14 +0000 |
| commit | 7d720a0e04c92d0bc9bbc854e7fc60eb0c742ffe (patch) | |
| tree | a3b7b1538fe1ae7cce70959a20543c7fef1a8e4b | |
| parent | e2c0a826c12e4632877ae4ea591b8e9d43699ef1 (diff) | |
| parent | fc1df623a9abe4fc8ce7a7b0540cc4c79423ed61 (diff) | |
| download | av-7d720a0e04c92d0bc9bbc854e7fc60eb0c742ffe.tar.gz | |
Merge "libaudiohal@aidl: Handle stream resume uniformly (2)" into main
| -rw-r--r-- | media/libaudiohal/impl/StreamHalAidl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp index 97c9659a36..70e7949491 100644 --- a/media/libaudiohal/impl/StreamHalAidl.cpp +++ b/media/libaudiohal/impl/StreamHalAidl.cpp @@ -379,10 +379,12 @@ status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) { return INVALID_OPERATION; } return OK; - } else if (state == StreamDescriptor::State::PAUSED) { + } else if (state == StreamDescriptor::State::PAUSED || + state == StreamDescriptor::State::TRANSFER_PAUSED || + state == StreamDescriptor::State::DRAIN_PAUSED) { return sendCommand(makeHalCommand<HalCommand::Tag::start>(), reply); } else { - ALOGE("%s: unexpected stream state: %s (expected IDLE or PAUSED)", + ALOGE("%s: unexpected stream state: %s (expected IDLE or one of *PAUSED states)", __func__, toString(state).c_str()); return INVALID_OPERATION; } |