Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab643050 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Update 'PauseSync' scenario in AudioStreamIoOutTest" into main... 

Merge "audio: Update 'PauseSync' scenario in AudioStreamIoOutTest" into main am: 5e6d99b4 am: f453736f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3047078



Change-Id: I0ae1ee7ce46ab75e5ec46471ef2500bf3cd99133
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7416925 f453736f

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1040,7 +1040,9 @@ class StreamWriterLogic : public StreamCommonLogic { 
                       << ": received invalid byte count in the reply: " << reply.fmqByteCount;

            return Status::ABORT;

        }

        if (getDataMQ()->availableToWrite() != getDataMQ()->getQuantumCount()) {

        // It is OK for the implementation to leave data in the MQ when the stream is paused.

        if (reply.state != StreamDescriptor::State::PAUSED &&

            getDataMQ()->availableToWrite() != getDataMQ()->getQuantumCount()) {

            LOG(ERROR) << __func__ << ": the HAL module did not consume all data from the data MQ: "

                       << "available to write " << getDataMQ()->availableToWrite()

                       << ", total size: " << getDataMQ()->getQuantumCount();
@@ -4550,9 +4552,8 @@ std::shared_ptr<StateSequence> makePauseCommands(bool isInput, bool isSync) { 
                                            std::make_pair(State::PAUSED, kStartCommand),

                                            std::make_pair(State::ACTIVE, kPauseCommand),

                                            std::make_pair(State::PAUSED, kBurstCommand),

                                            std::make_pair(State::PAUSED, kStartCommand),

                                            std::make_pair(State::ACTIVE, kPauseCommand)},

                                           State::PAUSED);

                                            std::make_pair(State::PAUSED, kFlushCommand)},

                                           State::IDLE);

        if (!isSync) {

            idle.children().push_back(

                    d->makeNodes({std::make_pair(State::TRANSFERRING, kPauseCommand),