Merge "AudioPolicyManager: fix device role for capture preset in call" into main (05b51380) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -4609,6 +4609,7 @@ status_t AudioPolicyManager::setDevicesRoleForCapturePreset(

		if (status == NO_ERROR) {
		updateInputRouting();
		updateCallRouting(false /fromCache/);
		}
		return status;
		}
		@@ -4626,7 +4627,10 @@ status_t AudioPolicyManager::addDevicesRoleForCapturePreset(
		"Engine could not add preferred devices %s for audio source %d role %d",
		dumpAudioDeviceTypeAddrVector(devices).c_str(), audioSource, role);

		if (status == NO_ERROR) {
		updateInputRouting();
		updateCallRouting(false /fromCache/);
		}
		return status;
		}

		@@ -4647,6 +4651,7 @@ status_t AudioPolicyManager::removeDevicesRoleForCapturePreset(
		"Engine could not remove devices role (%d) for capture preset %d", role, audioSource);
		if (status == NO_ERROR) {
		updateInputRouting();
		updateCallRouting(false /fromCache/);
		}
		return status;
		}
		@@ -4660,6 +4665,7 @@ status_t AudioPolicyManager::clearDevicesRoleForCapturePreset(audio_source_t aud
		"Engine could not clear devices role (%d) for capture preset %d", role, audioSource);
		if (status == NO_ERROR) {
		updateInputRouting();
		updateCallRouting(false /fromCache/);
		}
		return status;
		}