Merge "audio policy: fix legacy Ad2P with advanced codecs" (0ac26a45) · Commits · e / os / android_frameworks_av

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

+8 −6

Original line number	Diff line number	Diff line
		@@ -51,12 +51,6 @@ DeviceDescriptor::DeviceDescriptor(audio_devices_t type, const FormatVector &enc
		mEncodedFormats.add(AUDIO_FORMAT_AC3);
		mEncodedFormats.add(AUDIO_FORMAT_IEC61937);
		}
		// For backward compatibility always indicate support for SBC and AAC if no
		// supported format is listed in the configuration file
		if ((type & AUDIO_DEVICE_OUT_ALL_A2DP) != 0 && mEncodedFormats.isEmpty()) {
		mEncodedFormats.add(AUDIO_FORMAT_SBC);
		mEncodedFormats.add(AUDIO_FORMAT_AAC);
		}
		}

		audio_port_handle_t DeviceDescriptor::getId() const
		@@ -102,11 +96,19 @@ bool DeviceDescriptor::hasCurrentEncodedFormat() const
		if (!device_has_encoding_capability(type())) {
		return true;
		}
		if (mEncodedFormats.isEmpty()) {
		return true;
		}

		return (mCurrentEncodedFormat != AUDIO_FORMAT_DEFAULT);
		}

		bool DeviceDescriptor::supportsFormat(audio_format_t format)
		{
		if (mEncodedFormats.isEmpty()) {
		return true;
		}

		for (const auto& devFormat : mEncodedFormats) {
		if (devFormat == format) {
		return true;