commit f2ebd1c0de0b7debfeb6a62e1e86a74a9f6a1d8e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 26 11:17:58 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 26 11:17:58 2023 +0000
tree b5b018236961109de17493a46685e4b5396604ea
parent 64d148ee41c458ce9a33dcbca8b97b2afdcd2ef5
parent 4e89e7fd93707eac1f8378aba0fa20b306292bc7

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

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

Change-Id: Ie64cb194ae46c4da15615e9087f56e873a446a88
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 0aa8049..8b9eab0 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4552,7 +4552,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;