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

Commit 592430c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "audio: Use 'join' instead of 'stop' for stream workers" into main

parents 1a48b2d4 657284d4

audio/aidl/default/Stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ ndk::ScopedAStatus StreamCommonImpl::close() { 
    if (!isClosed()) {

        stopWorker();

        LOG(DEBUG) << __func__ << ": joining the worker thread...";

        mWorker->stop();

        mWorker->join();

        LOG(DEBUG) << __func__ << ": worker thread joined";

        onClose(mWorker->setClosed());

        return ndk::ScopedAStatus::ok();

audio/aidl/default/include/core-impl/Stream.h

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ struct StreamWorkerInterface { 
    virtual StreamDescriptor::State setClosed() = 0;

    virtual bool start() = 0;

    virtual pid_t getTid() = 0;

    virtual void stop() = 0;

    virtual void join() = 0;

    virtual std::string getError() = 0;

};
@@ -265,7 +265,7 @@ class StreamWorkerImpl : public StreamWorkerInterface, 
        return WorkerImpl::start(WorkerImpl::kThreadName, ANDROID_PRIORITY_URGENT_AUDIO);

    }

    pid_t getTid() override { return WorkerImpl::getTid(); }

    void stop() override { return WorkerImpl::stop(); }

    void join() override { return WorkerImpl::join(); }

    std::string getError() override { return WorkerImpl::getError(); }

};