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

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

Merge "audio: Fix HAL reply handling in CompressedOffloadOutputStreamTest" am:... 

Merge "audio: Fix HAL reply handling in CompressedOffloadOutputStreamTest" am: 9cce6228 am: c514b58a am: 4c05c749

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



Change-Id: Ia1b0ea860d11d1a05c84e5b5042c825960c6b322
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e3bc3df 4c05c749

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

+7 −3
Original line number Diff line number Diff line
@@ -1014,9 +1014,8 @@ class StreamWriter : public StreamWorker<StreamWriter> { 
        if (mDataPosition == 0) mOnDataStart();

        const size_t dataSize = std::min(mData.size() - mDataPosition, mDataMQ->availableToWrite());

        bool success = mDataMQ->write(mData.data() + mDataPosition, dataSize);

        bool wrapped = false;

        ALOGE_IF(!success, "data message queue write failed");

        mDataPosition += dataSize;

        if (mDataPosition >= mData.size()) mDataPosition = 0;

        mEfGroup->wake(static_cast<uint32_t>(MessageQueueFlagBits::NOT_EMPTY));



        uint32_t efState = 0;
@@ -1034,6 +1033,11 @@ class StreamWriter : public StreamWorker<StreamWriter> { 
                ALOGE("bad write status: %d", writeStatus.retval);

                success = false;

            }

            mDataPosition += writeStatus.reply.written;

            if (mDataPosition >= mData.size()) {

                mDataPosition = 0;

                wrapped = true;

            }

        }

        if (ret == -EAGAIN || ret == -EINTR) {

            // Spurious wakeup. This normally retries no more than once.
@@ -1042,7 +1046,7 @@ class StreamWriter : public StreamWorker<StreamWriter> { 
            ALOGE("bad wait status: %d", ret);

            success = false;

        }

        if (success && mDataPosition == 0) {

        if (wrapped) {

            success = mOnDataWrap();

        }

        return success;