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

Commit d3fa3c14 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 20baac2a: Merge "AudioPolicy: don\'t always change ACCESSIBILITY volume" into mnc-dr-dev 

* commit '20baac2a':
  AudioPolicy: don't always change ACCESSIBILITY volume
parents 69c19abd 20baac2a

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,9 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
                status = volStatus;

            }

        }

        if ((device == AUDIO_DEVICE_OUT_DEFAULT) || ((curDevice & accessibilityDevice) != 0)) {

        if ((accessibilityDevice != AUDIO_DEVICE_NONE) &&

                ((device == AUDIO_DEVICE_OUT_DEFAULT) || ((curDevice & accessibilityDevice) != 0)))

        {

            status_t volStatus = checkAndSetVolume(AUDIO_STREAM_ACCESSIBILITY,

                                                   index, desc, curDevice);

        }