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

Commit 787abcd5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594,... 

Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release

Change-Id: Iaabc0959d0187e98e0e15a393355c2dbc7bc148d
parents 15d34e3a 2f0fe27a

audio/core/all-versions/default/StreamIn.cpp

+4 −4
Original line number Diff line number Diff line
@@ -390,9 +390,9 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    }



    // Create and launch the thread.

    auto tempReadThread =

        std::make_unique<ReadThread>(&mStopReadThread, mStream, tempCommandMQ.get(),

                                     tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    sp<ReadThread> tempReadThread =

            new ReadThread(&mStopReadThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

                           tempStatusMQ.get(), tempElfGroup.get());

    if (!tempReadThread->init()) {

        ALOGW("failed to start reader thread: %s", strerror(-status));

        sendError(Result::INVALID_ARGUMENTS);
@@ -408,7 +408,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mReadThread = tempReadThread.release();

    mReadThread = tempReadThread;

    mEfGroup = tempElfGroup.release();

    threadInfo.pid = getpid();

    threadInfo.tid = mReadThread->getTid();

audio/core/all-versions/default/StreamOut.cpp

+4 −4
Original line number Diff line number Diff line
@@ -376,9 +376,9 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    }



    // Create and launch the thread.

    auto tempWriteThread =

        std::make_unique<WriteThread>(&mStopWriteThread, mStream, tempCommandMQ.get(),

                                      tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    sp<WriteThread> tempWriteThread =

            new WriteThread(&mStopWriteThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

                            tempStatusMQ.get(), tempElfGroup.get());

    if (!tempWriteThread->init()) {

        ALOGW("failed to start writer thread: %s", strerror(-status));

        sendError(Result::INVALID_ARGUMENTS);
@@ -394,7 +394,7 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mWriteThread = tempWriteThread.release();

    mWriteThread = tempWriteThread;

    mEfGroup = tempElfGroup.release();

    threadInfo.pid = getpid();

    threadInfo.tid = mWriteThread->getTid();