Merge "Clean up error logging audio device type collection." (f5614e2f) · Commits · e / os / android_frameworks_av

services/audiopolicy/enginedefault/src/Engine.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -463,8 +463,8 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy,
		"getDevicesForStrategy() no default device defined");
		}

		ALOGVV("getDevices"
		"ForStrategy() strategy %d, device %x", strategy, devices.types());
		ALOGVV("getDevices ForStrategy() strategy %d, device %s",
		strategy, dumpDeviceTypes(devices.types()).c_str());
		return devices;
		}

		@@ -636,8 +636,9 @@ DeviceVector Engine::getDevicesForProductStrategy(product_strategy_t strategy) c
		String8(preferredStrategyDevice.mAddress.c_str()),
		AUDIO_FORMAT_DEFAULT);
		if (preferredAvailableDevDescr != nullptr) {
		ALOGVV("%s using pref device 0x%08x/%s for strategy %u", __FUNCTION__,
		preferredStrategyDevice.mType, preferredStrategyDevice.mAddress, strategy);
		ALOGVV("%s using pref device 0x%08x/%s for strategy %u",
		__func__, preferredStrategyDevice.mType,
		preferredStrategyDevice.mAddress.c_str(), strategy);
		return DeviceVector(preferredAvailableDevDescr);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -6047,7 +6047,7 @@ void AudioPolicyManager::applyStreamVolumes(const sp<AudioOutputDescriptor>& out
		int delayMs,
		bool force)
		{
		ALOGVV("applyStreamVolumes() for device %08x", device);
		ALOGVV("applyStreamVolumes() for device %s", dumpDeviceTypes(deviceTypes).c_str());
		for (const auto &volumeGroup : mEngine->getVolumeGroups()) {
		auto &curves = getVolumeCurves(toVolumeSource(volumeGroup));
		checkAndSetVolume(curves, toVolumeSource(volumeGroup),