Merge "Fix "invalid device combination" in system audio mode." into lmp-dev (cb16968f) · Commits · e / os / android_frameworks_av

services/audiopolicy/AudioPolicyManager.cpp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4634,8 +4634,15 @@ audio_devices_t AudioPolicyManager::getDeviceForVolume(audio_devices_t device)
	// - one A2DP device + another device: happens with duplicated output. In this case		// - one A2DP device + another device: happens with duplicated output. In this case
	// retain the device on the A2DP output as the other must not correspond to an active		// retain the device on the A2DP output as the other must not correspond to an active
	// selection if not the speaker.		// selection if not the speaker.
			// - HDMI-CEC system audio mode only output: give priority to available item in order.
	if (device & AUDIO_DEVICE_OUT_SPEAKER) {		if (device & AUDIO_DEVICE_OUT_SPEAKER) {
	device = AUDIO_DEVICE_OUT_SPEAKER;		device = AUDIO_DEVICE_OUT_SPEAKER;
			} else if (device & AUDIO_DEVICE_OUT_HDMI_ARC) {
			device = AUDIO_DEVICE_OUT_HDMI_ARC;
			} else if (device & AUDIO_DEVICE_OUT_AUX_LINE) {
			device = AUDIO_DEVICE_OUT_AUX_LINE;
			} else if (device & AUDIO_DEVICE_OUT_SPDIF) {
			device = AUDIO_DEVICE_OUT_SPDIF;
	} else {		} else {
	device = (audio_devices_t)(device & AUDIO_DEVICE_OUT_ALL_A2DP);		device = (audio_devices_t)(device & AUDIO_DEVICE_OUT_ALL_A2DP);
	}		}