Snap for 10347357 from 55825ec1d0feb347498dbc66e046685b328a8e1b to udc-release (4316fdd2) · Commits · e / os / android_frameworks_av

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,8 @@ status_t AudioPolicyMixCollection::registerMix(const AudioMix& mix,
		for (size_t i = 0; i < size(); i++) {
		const sp<AudioPolicyMix>& registeredMix = itemAt(i);
		if (mix.mDeviceType == registeredMix->mDeviceType
		&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0) {
		&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0
		&& is_mix_loopback(mix.mRouteFlags)) {
		ALOGE("registerMix(): mix already registered for dev=0x%x addr=%s",
		mix.mDeviceType, mix.mDeviceAddress.string());
		return BAD_VALUE;

+6 −5

Original line number	Diff line number	Diff line
		@@ -1337,13 +1337,14 @@ TEST_F(AudioPolicyManagerTestDynamicPolicy, RegisterPolicyMixes) {
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "", audioConfig);
		ASSERT_EQ(INVALID_OPERATION, ret);

		// The first time to register valid policy mixes should succeed.
		// The first time to register valid loopback policy mix should succeed.
		clearPolicyMix();
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_RENDER,
		AUDIO_DEVICE_OUT_SPEAKER, "", audioConfig);
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_LOOP_BACK,
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "addr", audioConfig);
		ASSERT_EQ(NO_ERROR, ret);
		// Registering the same policy mixes should fail.
		ret = mManager->registerPolicyMixes(mAudioMixes);
		// Registering the render policy for the loopback address should succeed.
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_RENDER,
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "addr", audioConfig);
		ASSERT_EQ(INVALID_OPERATION, ret);
		}