Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c6eee02 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Do not log error if HAL does not support VOIP volume." am: 42437aa7 am: 4e89e7fd am: f2ebd1c0 am: ae05f9dc am: 1bb76185

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



Change-Id: Ie2ec85737763f3a2095bb6794b97ba18929f4fd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f408812 1bb76185

services/audioflinger/Threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -4700,7 +4700,8 @@ status_t AudioFlinger::PlaybackThread::handleVoipVolume_l(float *volume) 
    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;