Merge "Fix null pointer handling in ag/25316441" into main (ef593083) · Commits · e / os / android_frameworks_base

services/core/jni/tvinput/JTvInputHal.cpp

+14 −5

Original line number	Diff line number	Diff line
		@@ -494,12 +494,21 @@ JTvInputHal::ITvInputWrapper::ITvInputWrapper(std::shared_ptr<AidlITvInput>& aid
		::ndk::ScopedAStatus JTvInputHal::ITvInputWrapper::setCallback(
		const std::shared_ptr<TvInputCallbackWrapper>& in_callback) {
		if (mIsHidl) {
		if (in_callback == nullptr) {
		return hidlSetCallback(nullptr);
		}
		else {
		in_callback->aidlTvInputCallback = nullptr;
		return hidlSetCallback(in_callback == nullptr ? nullptr : in_callback->hidlTvInputCallback);
		return hidlSetCallback(in_callback->hidlTvInputCallback);
		}
		} else {
		if (in_callback == nullptr) {
		return mAidlTvInput->setCallback(nullptr);
		}
		else {
		in_callback->hidlTvInputCallback = nullptr;
		return mAidlTvInput->setCallback(in_callback == nullptr ? nullptr
		: in_callback->aidlTvInputCallback);
		return mAidlTvInput->setCallback(in_callback->aidlTvInputCallback);
		}
		}
		}