commit ae05f9dcd8668a60b463e2b8e94cee9184939d02
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 26 12:08:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 26 12:08:19 2023 +0000
tree 9c0d23fd3084860456fdb3ecea544035341b3e4e
parent 0077d8c43f2c08faf685f1f9108b0415812647d7
parent f2ebd1c0de0b7debfeb6a62e1e86a74a9f6a1d8e

Merge "Do not log error if HAL does not support VOIP volume." am: 42437aa710 am: 4e89e7fd93 am: f2ebd1c0de

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2585177

Change-Id: I7bd4d8fa60c2f887332a1e54a768d4223ee8eaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index c2babfa..4510638 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4700,7 +4700,8 @@
     if ((mOutput->flags & AUDIO_OUTPUT_FLAG_VOIP_RX) != 0) {
         if (*volume != mLeftVolFloat) {
             result = mOutput->stream->setVolume(*volume, *volume);
-            ALOGE_IF(result != OK,
+            // HAL can return INVALID_OPERATION if operation is not supported.
+            ALOGE_IF(result != OK && result != INVALID_OPERATION,
                      "Error when setting output stream volume: %d", result);
             if (result == NO_ERROR) {
                 mLeftVolFloat = *volume;