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

Commit efbaaf13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal@aidl: Fix 'localReply' scope in 'sendCommand'" into main am: 6b8559dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3044712



Change-Id: I271c317ac1684c3cfaabe5d5a9c32c7d3e7c7e28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1ecae6c 6b8559dd

media/libaudiohal/impl/StreamHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -506,13 +506,13 @@ status_t StreamHalAidl::sendCommand( 
                "%s %s: must be invoked from the worker thread (%d)",

                __func__, command.toString().c_str(), workerTid);

    }

    StreamDescriptor::Reply localReply{};

    {

        std::lock_guard l(mCommandReplyLock);

        if (!mContext.getCommandMQ()->writeBlocking(&command, 1)) {

            ALOGE("%s: failed to write command %s to MQ", __func__, command.toString().c_str());

            return NOT_ENOUGH_DATA;

        }

        StreamDescriptor::Reply localReply{};

        if (reply == nullptr) {

            reply = &localReply;

        }