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

Commit 7202f80d authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev am: 888fd19a 

am: a2c2cbc0

Change-Id: I4f50dfc7bdff3805831b54cb7105b3a65fca280b
parents 5a6dfd54 a2c2cbc0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -2165,7 +2165,8 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
                continue;

            }

            routing_strategy curStrategy = getStrategy((audio_stream_type_t)curStream);

            audio_devices_t curStreamDevice = getDeviceForStrategy(curStrategy, false /*fromCache*/);

            audio_devices_t curStreamDevice = Volume::getDeviceForVolume(getDeviceForStrategy(

                    curStrategy, false /*fromCache*/));

            if ((device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) &&

                    ((curStreamDevice & device) == 0)) {

                continue;
@@ -2176,7 +2177,7 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
                applyVolume = (curDevice & curStreamDevice) != 0;

            } else {

                applyVolume = !mVolumeCurves->hasVolumeIndexForDevice(

                        stream, Volume::getDeviceForVolume(curStreamDevice));

                        stream, curStreamDevice);

            }



            if (applyVolume) {