Merge "Notify FilterCallbackScheduler to wake up it while stopping." (de4d3d9f) · Commits · e / os / android_hardware_interfaces

tv/tuner/aidl/default/Filter.cpp

+9 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,11 @@ void FilterCallbackScheduler::start() {
		}

		void FilterCallbackScheduler::stop() {
		{
		std::unique_lock<std::mutex> lock(mLock);
		mIsRunning = false;
		mCv.notify_all();
		}
		if (mCallbackThread.joinable()) {
		mCallbackThread.join();
		}
		@@ -113,6 +117,10 @@ void FilterCallbackScheduler::threadLoopOnce() {
		// okay to send data.
		mCv.wait(lock);
		}
		if (!mIsRunning) {
		lock.unlock();
		return;
		}

		// condition_variable wait locks mutex on timeout / notify
		if (!mCallbackBuffer.empty()) {