commit 592430c84e4454f65a110fbde1d7662547bfcf3c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 24 21:06:59 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 24 21:06:59 2024 +0000
tree 3a9fe5e04adccb520ae4f905f2714e73a7c54e20
parent 1a48b2d4165af2cc3f71148b424595f30fc50a0d
parent 657284d4ef31a9829c13fef818fe2d41f8c0382e

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

audio/aidl/default/Stream.cpp

diff --git a/audio/aidl/default/Stream.cpp b/audio/aidl/default/Stream.cpp
index 8f5e839..389860f 100644
--- a/audio/aidl/default/Stream.cpp
+++ b/audio/aidl/default/Stream.cpp
@@ -772,7 +772,7 @@
     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

diff --git a/audio/aidl/default/include/core-impl/Stream.h b/audio/aidl/default/include/core-impl/Stream.h
index 6b45866..93ace96 100644
--- a/audio/aidl/default/include/core-impl/Stream.h
+++ b/audio/aidl/default/include/core-impl/Stream.h
@@ -245,7 +245,7 @@
     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 @@
         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(); }
 };