Merge "Flush events before stopping filter." (0c0e4138) · Commits · e / os / android_hardware_interfaces

tv/tuner/aidl/default/Filter.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,12 @@ void FilterCallbackScheduler::onFilterStatus(const DemuxFilterStatus& status) {
		}
		}

		void FilterCallbackScheduler::flushEvents() {
		std::unique_lock<std::mutex> lock(mLock);
		mCallbackBuffer.clear();
		mDataLength = 0;
		}

		void FilterCallbackScheduler::setTimeDelayHint(int timeDelay) {
		// updating the setTimeDelay does not go into effect until the condition
		// variable times out or is notified.
		@@ -335,6 +341,8 @@ Filter::~Filter() {
		mFilterThread.join();
		}

		mCallbackScheduler.flushEvents();

		return ::ndk::ScopedAStatus::ok();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ class FilterCallbackScheduler final {

		bool hasCallbackRegistered() const;

		void flushEvents();

		private:
		void start();
		void stop();