Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: I7fd7876b9f79f70c78737b865bc740ea87aee79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-24 21:27:34 +00:00
committed by Automerger Merge Worker
parent c07973b7b2 592430c84e
commit 207cca8188
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/aidl/default/Stream.cpp
View File

@@ -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();

4
audio/aidl/default/include/core-impl/Stream.h
View File

@@ -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(); }
};