From ff50856c40fe95e84c8ba89f742d0c5181224773 Mon Sep 17 00:00:00 2001 From: Gisaac Date: Wed, 27 Aug 2025 11:30:58 +0800 Subject: [PATCH 1/2] fix bug about save volume Signed-off-by: Gisaac --- .../domain/volume/src/audio_volume_manager.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp index a45b685d0c..0733b3b636 100644 --- a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp @@ -510,16 +510,8 @@ int32_t AudioVolumeManager::SetSystemVolumeLevel(AudioStreamType streamType, int int32_t AudioVolumeManager::SaveSpecifiedDeviceVolume(AudioStreamType streamType, int32_t volumeLevel, DeviceType deviceType) { - int32_t sVolumeLevel = volumeLevel; - if (deviceType == DEVICE_TYPE_BLUETOOTH_A2DP || deviceType == DEVICE_TYPE_BLUETOOTH_SCO || - deviceType == DEVICE_TYPE_USB_HEADSET || deviceType == DEVICE_TYPE_USB_ARM_HEADSET || - deviceType == DEVICE_TYPE_WIRED_HEADSET || deviceType == DEVICE_TYPE_WIRED_HEADPHONES || - deviceType == DEVICE_TYPE_NEARLINK) { - sVolumeLevel = SelectDealSafeVolume(streamType, volumeLevel, deviceType); - } - int32_t result = audioPolicyManager_.SaveSpecifiedDeviceVolume( - VolumeUtils::GetVolumeTypeFromStreamType(streamType), sVolumeLevel, deviceType); - return result; + return result = audioPolicyManager_.SaveSpecifiedDeviceVolume( + VolumeUtils::GetVolumeTypeFromStreamType(streamType), volumeLevel, deviceType); } int32_t AudioVolumeManager::SelectDealSafeVolume(AudioStreamType streamType, int32_t volumeLevel, -- Gitee From 629da50676234dd16941802d3f17bae0af2abec4 Mon Sep 17 00:00:00 2001 From: Gisaac Date: Wed, 27 Aug 2025 03:56:41 +0000 Subject: [PATCH 2/2] update services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp. Signed-off-by: Gisaac --- .../server/domain/volume/src/audio_volume_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp index 0733b3b636..f76b502a2a 100644 --- a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp @@ -510,7 +510,7 @@ int32_t AudioVolumeManager::SetSystemVolumeLevel(AudioStreamType streamType, int int32_t AudioVolumeManager::SaveSpecifiedDeviceVolume(AudioStreamType streamType, int32_t volumeLevel, DeviceType deviceType) { - return result = audioPolicyManager_.SaveSpecifiedDeviceVolume( + return audioPolicyManager_.SaveSpecifiedDeviceVolume( VolumeUtils::GetVolumeTypeFromStreamType(streamType), volumeLevel, deviceType); } -- Gitee