Snap for 7749288 from f690c468780ceb12554d1277256a24a66d49d149 to sc-v2-release (e680973b) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@
		#include <system/audio_effects/effect_ns.h>
		#include <system/audio_effects/effect_aec.h>
		#include <system/audio_effects/effect_hapticgenerator.h>
		#include <system/audio_effects/effect_spatializer.h>

		#include <audio_utils/primitives.h>

		@@ -3745,6 +3746,15 @@ status_t AudioFlinger::createEffect(const media::CreateEffectRequest& request,
		goto Exit;
		}

		// Only audio policy service can create a spatializer effect
		if ((memcmp(&descOut.type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0) &&
		(callingUid != AID_AUDIOSERVER \|\| currentPid != getpid())) {
		ALOGW("%s: attempt to create a spatializer effect from uid/pid %d/%d",
		__func__, callingUid, currentPid);
		lStatus = PERMISSION_DENIED;
		goto Exit;
		}

		if (io == AUDIO_IO_HANDLE_NONE && sessionId == AUDIO_SESSION_OUTPUT_MIX) {
		// if the output returned by getOutputForEffect() is removed before we lock the
		// mutex below, the call to checkPlaybackThread_l(io) below will detect it

+7 −0

Original line number	Diff line number	Diff line
		@@ -1336,6 +1336,13 @@ status_t AudioFlinger::PlaybackThread::checkEffectCompatibility_l(
		return BAD_VALUE;
		}

		if (memcmp(&desc->type, FX_IID_SPATIALIZER, sizeof(effect_uuid_t)) == 0
		&& mType != SPATIALIZER) {
		ALOGW("%s: attempt to create a spatializer effect on a thread of type %d",
		__func__, mType);
		return BAD_VALUE;
		}

		switch (mType) {
		case MIXER: {
		#ifndef MULTICHANNEL_EFFECT_CHAIN