Merge "The sonification sound is muted during a shutter sound" into pi-dev (527c6cc1) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -1266,6 +1266,11 @@ status_t AudioPolicyManager::startSource(const sp<AudioOutputDescriptor>& output
		// We do not introduce additional delay here.
		}

		if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&
		mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {
		setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);
		}

		return NO_ERROR;
		}

		@@ -1366,6 +1371,12 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD
		// update the outputs if stopping one with a stream that can affect notification routing
		handleNotificationRoutingForStream(stream);
		}

		if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&
		mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {
		setStrategyMute(STRATEGY_SONIFICATION, false, outputDesc);
		}

		if (stream == AUDIO_STREAM_MUSIC) {
		selectOutputForMusicEffects();
		}