Merge "Add replySize for EFFECT_CMD_RESET to align with other commands" into main (c5441018) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+6 −6

services/audioflinger/Effects.cpp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -825,7 +825,10 @@ void AudioFlinger::EffectModule::reset_l()
	if (mStatus != NO_ERROR \|\| mEffectInterface == 0) {		if (mStatus != NO_ERROR \|\| mEffectInterface == 0) {
	return;		return;
	}		}
	mEffectInterface->command(EFFECT_CMD_RESET, 0, NULL, 0, NULL);
			int reply = 0;
			uint32_t replySize = sizeof(reply);
			mEffectInterface->command(EFFECT_CMD_RESET, 0, NULL, &replySize, &reply);
	}		}

	status_t AudioFlinger::EffectModule::configure()		status_t AudioFlinger::EffectModule::configure()

Original line number	Original line	Diff line number	Diff line
	@@ -255,37 +255,37 @@ status_t EffectConversionHelperAidl::handleGetConfig(uint32_t cmdSize __unused,
	status_t EffectConversionHelperAidl::handleReset(uint32_t cmdSize __unused,		status_t EffectConversionHelperAidl::handleReset(uint32_t cmdSize __unused,
	const void* pCmdData __unused, uint32_t* replySize,		const void* pCmdData __unused, uint32_t* replySize,
	void* pReplyData) {		void* pReplyData) {
	if (!replySize \|\| !pReplyData) {		if (!replySize \|\| *replySize != sizeof(int) \|\| !pReplyData) {
	ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,		ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,
	numericPointerToString(replySize).c_str(), pReplyData);		numericPointerToString(replySize).c_str(), pReplyData);
	return BAD_VALUE;		return BAD_VALUE;
	}		}

	return statusTFromBinderStatus(mEffect->command(CommandId::RESET));		return (int )pReplyData = statusTFromBinderStatus(mEffect->command(CommandId::RESET));
	}		}

	status_t EffectConversionHelperAidl::handleEnable(uint32_t cmdSize __unused,		status_t EffectConversionHelperAidl::handleEnable(uint32_t cmdSize __unused,
	const void* pCmdData __unused,		const void* pCmdData __unused,
	uint32_t* replySize, void* pReplyData) {		uint32_t* replySize, void* pReplyData) {
	if (!replySize \|\| !pReplyData) {		if (!replySize \|\| *replySize != sizeof(int) \|\| !pReplyData) {
	ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,		ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,
	numericPointerToString(replySize).c_str(), pReplyData);		numericPointerToString(replySize).c_str(), pReplyData);
	return BAD_VALUE;		return BAD_VALUE;
	}		}

	return statusTFromBinderStatus(mEffect->command(CommandId::START));		return (int )pReplyData = statusTFromBinderStatus(mEffect->command(CommandId::START));
	}		}

	status_t EffectConversionHelperAidl::handleDisable(uint32_t cmdSize __unused,		status_t EffectConversionHelperAidl::handleDisable(uint32_t cmdSize __unused,
	const void* pCmdData __unused,		const void* pCmdData __unused,
	uint32_t* replySize, void* pReplyData) {		uint32_t* replySize, void* pReplyData) {
	if (!replySize \|\| !pReplyData) {		if (!replySize \|\| *replySize != sizeof(int) \|\| !pReplyData) {
	ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,		ALOGE("%s parameter invalid, replySize %s pReplyData %p", __func__,
	numericPointerToString(replySize).c_str(), pReplyData);		numericPointerToString(replySize).c_str(), pReplyData);
	return BAD_VALUE;		return BAD_VALUE;
	}		}

	return statusTFromBinderStatus(mEffect->command(CommandId::STOP));		return (int )pReplyData = statusTFromBinderStatus(mEffect->command(CommandId::STOP));
	}		}

	status_t EffectConversionHelperAidl::handleSetAudioSource(uint32_t cmdSize, const void* pCmdData,		status_t EffectConversionHelperAidl::handleSetAudioSource(uint32_t cmdSize, const void* pCmdData,