From 474816b6f1fa00e8f5210cab374069b624bec0cd Mon Sep 17 00:00:00 2001 From: Ashish Date: Mon, 18 Jul 2022 13:10:54 +0530 Subject: [PATCH] Revert "[Change]GetVolume to return 0 when mute is true" This reverts commit 348ed7082d92351123e89aef675794ceb2cf80f1. Signed-off-by: Ashish --- .../audio_policy/server/audio_policy_server.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/services/src/audio_policy/server/audio_policy_server.cpp b/services/src/audio_policy/server/audio_policy_server.cpp index a5e99d13..d04aaa87 100644 --- a/services/src/audio_policy/server/audio_policy_server.cpp +++ b/services/src/audio_policy/server/audio_policy_server.cpp @@ -234,9 +234,6 @@ int32_t AudioPolicyServer::SetStreamVolume(AudioStreamType streamType, float vol float AudioPolicyServer::GetStreamVolume(AudioStreamType streamType) { - if (GetStreamMute(streamType)) { - return MIN_VOLUME_LEVEL; - } return mPolicyService.GetStreamVolume(streamType); } @@ -249,18 +246,7 @@ int32_t AudioPolicyServer::SetStreamMute(AudioStreamType streamType, bool mute) } } - int result = mPolicyService.SetStreamMute(streamType, mute); - for (auto it = volumeChangeCbsMap_.begin(); it != volumeChangeCbsMap_.end(); ++it) { - std::shared_ptr volumeChangeCb = it->second; - if (volumeChangeCb == nullptr) { - AUDIO_ERR_LOG("volumeChangeCb: nullptr for client : %{public}d", it->first); - continue; - } - AUDIO_DEBUG_LOG("AudioPolicyServer::SetStreamMute trigger volumeChangeCb clientPid : %{public}d", it->first); - volumeChangeCb->OnVolumeKeyEvent(streamType, ConvertVolumeToInt(GetStreamVolume(streamType)), false); - } - - return result; + return mPolicyService.SetStreamMute(streamType, mute); } int32_t AudioPolicyServer::SetStreamVolume(AudioStreamType streamType, float volume, bool isUpdateUi)