diff --git a/audio/aidl/default/Stream.cpp b/audio/aidl/default/Stream.cpp index 8f5e83914c..389860fa2e 100644 --- a/audio/aidl/default/Stream.cpp +++ b/audio/aidl/default/Stream.cpp @@ -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(); diff --git a/audio/aidl/default/include/core-impl/Stream.h b/audio/aidl/default/include/core-impl/Stream.h index 6b45866a38..93ace96b5c 100644 --- a/audio/aidl/default/include/core-impl/Stream.h +++ b/audio/aidl/default/include/core-impl/Stream.h @@ -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(); } };