Merge "APM: add more logging when setting stream to drive abs vol" into main (29b387d7) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -3556,6 +3556,9 @@ status_t AudioPolicyManager::setDeviceAbsoluteVolumeEnabled(audio_devices_t devi
		bool enabled,
		audio_stream_type_t streamToDriveAbs)
		{
		ALOGI("%s: deviceType 0x%X, enabled %d, streamToDriveAbs %d", __func__, deviceType, enabled,
		streamToDriveAbs);

		if (!enabled) {
		mAbsoluteVolumeDrivingStreams.erase(deviceType);
		return NO_ERROR;
		@@ -8312,9 +8315,9 @@ float AudioPolicyManager::adjustDeviceAttenuationForAbsVolume(IVolumeCurves &cur
		float volumeDb = curves.volIndexToDb(deviceCategory, index);

		if (com_android_media_audio_abs_volume_index_fix()) {
		if (mAbsoluteVolumeDrivingStreams.find(volumeDevice) !=
		mAbsoluteVolumeDrivingStreams.end()) {
		audio_attributes_t attributesToDriveAbs = mAbsoluteVolumeDrivingStreams[volumeDevice];
		const auto it = mAbsoluteVolumeDrivingStreams.find(volumeDevice);
		if (it != mAbsoluteVolumeDrivingStreams.end()) {
		audio_attributes_t attributesToDriveAbs = it->second;
		auto groupToDriveAbs = mEngine->getVolumeGroupForAttributes(attributesToDriveAbs);
		if (groupToDriveAbs == VOLUME_GROUP_NONE) {
		ALOGD("%s: no group matching with %s", __FUNCTION__,

+3 −0

Original line number	Diff line number	Diff line
		@@ -1121,6 +1121,9 @@ Status AudioPolicyService::releaseInput(int32_t portIdAidl)
		Status AudioPolicyService::setDeviceAbsoluteVolumeEnabled(const AudioDevice& deviceAidl,
		bool enabled,
		AudioStreamType streamToDriveAbsAidl) {
		ALOGI("%s: deviceAidl %s, enabled %d, streamToDriveAbsAidl %d", __func__,
		deviceAidl.toString().c_str(), enabled, streamToDriveAbsAidl);

		audio_stream_type_t streamToDriveAbs = VALUE_OR_RETURN_BINDER_STATUS(
		aidl2legacy_AudioStreamType_audio_stream_type_t(streamToDriveAbsAidl));
		audio_devices_t deviceType;