Merge "Fix Tuner CTS test deadlock issue" into main (6d5e103f) · Commits · e / os / android_frameworks_av

services/tuner/TunerFilter.cpp

+23 −9

Original line number	Diff line number	Diff line
		@@ -335,26 +335,40 @@ shared_ptr<IFilter> TunerFilter::getHalFilter() {

		/////////////// FilterCallback ///////////////////////
		::ndk::ScopedAStatus TunerFilter::FilterCallback::onFilterStatus(DemuxFilterStatus status) {
		shared_ptr<ITunerFilterCallback> cb(nullptr);
		{
		Mutex::Autolock _l(mCallbackLock);
		if (mTunerFilterCallback != nullptr) {
		mTunerFilterCallback->onFilterStatus(status);
		cb = mTunerFilterCallback;
		}
		if (cb != nullptr) {
		cb->onFilterStatus(status);
		}
		return ::ndk::ScopedAStatus::ok();
		}

		::ndk::ScopedAStatus TunerFilter::FilterCallback::onFilterEvent(
		const vector<DemuxFilterEvent>& events) {
		shared_ptr<ITunerFilterCallback> cb(nullptr);
		{
		Mutex::Autolock _l(mCallbackLock);
		if (mTunerFilterCallback != nullptr) {
		mTunerFilterCallback->onFilterEvent(events);
		cb = mTunerFilterCallback;
		}
		if (cb != nullptr) {
		cb->onFilterEvent(events);
		}
		return ::ndk::ScopedAStatus::ok();
		}

		void TunerFilter::FilterCallback::sendSharedFilterStatus(int32_t status) {
		shared_ptr<ITunerFilterCallback> cb(nullptr);
		shared_ptr<ITunerFilterCallback> orig_cb(nullptr);
		{
		Mutex::Autolock _l(mCallbackLock);
		if (mTunerFilterCallback != nullptr && mOriginalCallback != nullptr) {
		mTunerFilterCallback->onFilterStatus(static_cast<DemuxFilterStatus>(status));
		cb = mTunerFilterCallback;
		orig_cb = mOriginalCallback;
		}
		if (cb != nullptr && orig_cb != nullptr) {
		cb->onFilterStatus(static_cast<DemuxFilterStatus>(status));
		}
		}