Merge "Audio policy: fix failure to unmute strategy." into rvc-dev (6b72bc88) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −9

Original line number	Diff line number	Diff line
		@@ -5770,15 +5770,6 @@ uint32_t AudioPolicyManager::setOutputDevices(const sp<SwAudioOutputDescriptor>&
		DeviceVector filteredDevices = outputDesc->filterSupportedDevices(devices);
		DeviceVector prevDevices = outputDesc->devices();

		// no need to proceed if new device is not AUDIO_DEVICE_NONE and not supported by current
		// output profile or if new device is not supported AND previous device(s) is(are) still
		// available (otherwise reset device must be done on the output)
		if (!devices.isEmpty() && filteredDevices.isEmpty() &&
		!mAvailableOutputDevices.filter(prevDevices).empty()) {
		ALOGV("%s: unsupported device %s for output", __func__, devices.toString().c_str());
		return 0;
		}

		ALOGV("setOutputDevices() prevDevice %s", prevDevices.toString().c_str());

		if (!filteredDevices.isEmpty()) {
		@@ -5793,6 +5784,17 @@ uint32_t AudioPolicyManager::setOutputDevices(const sp<SwAudioOutputDescriptor>&
		muteWaitMs = 0;
		}

		// no need to proceed if new device is not AUDIO_DEVICE_NONE and not supported by current
		// output profile or if new device is not supported AND previous device(s) is(are) still
		// available (otherwise reset device must be done on the output)
		if (!devices.isEmpty() && filteredDevices.isEmpty() &&
		!mAvailableOutputDevices.filter(prevDevices).empty()) {
		ALOGV("%s: unsupported device %s for output", __func__, devices.toString().c_str());
		// restore previous device after evaluating strategy mute state
		outputDesc->setDevices(prevDevices);
		return muteWaitMs;
		}

		// Do not change the routing if:
		// the requested device is AUDIO_DEVICE_NONE
		// OR the requested device is the same as current device