Snap for 6820514 from e1f1cb5827a6c99d41e05e090b3b382f3598a58e to rvc-qpr1-release (a646fb27) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -3161,6 +3161,8 @@ void AudioPolicyManager::updateCallAndOutputRouting(bool forceVolumeReeval, uint
		if (mEngine->getPhoneState() == AUDIO_MODE_IN_CALL && hasPrimaryOutput()) {
		DeviceVector newDevices = getNewOutputDevices(mPrimaryOutput, true /fromCache/);
		waitMs = updateCallRouting(newDevices, delayMs);
		// Only apply special touch sound delay once
		delayMs = 0;
		}
		for (size_t i = 0; i < mOutputs.size(); i++) {
		sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueAt(i);
		@@ -3170,6 +3172,8 @@ void AudioPolicyManager::updateCallAndOutputRouting(bool forceVolumeReeval, uint
		// preventing the force re-routing in case of default dev that distinguishes on address.
		// Let's give back to engine full device choice decision however.
		waitMs = setOutputDevices(outputDesc, newDevices, !newDevices.isEmpty(), delayMs);
		// Only apply special touch sound delay once
		delayMs = 0;
		}
		if (forceVolumeReeval && !newDevices.isEmpty()) {
		applyStreamVolumes(outputDesc, newDevices.types(), waitMs, true);