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

Commit 261413ac authored by nobuaki tanaka's avatar nobuaki tanaka Committed by android-build-merger
Browse files

Merge "Apply stream volume for the correct device" am: c6b48fe6 

am: 03a9cbbe

Change-Id: I90b77ff4c1240429836d9ada53855a01571d90d4
parents 7a1d258c 03a9cbbe

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2291,7 +2291,7 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
    status_t status = NO_ERROR;

    for (size_t i = 0; i < mOutputs.size(); i++) {

        sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);

        audio_devices_t curDevice = Volume::getDeviceForVolume(desc->device());

        audio_devices_t curDevice = desc->device();

        for (int curStream = 0; curStream < AUDIO_STREAM_FOR_POLICY_CNT; curStream++) {

            if (!streamsMatchForvolume(stream, (audio_stream_type_t)curStream)) {

                continue;
@@ -2310,7 +2310,7 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
            bool applyVolume;

            if (device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {

                curStreamDevice |= device;

                applyVolume = (curDevice & curStreamDevice) != 0;

                applyVolume = (Volume::getDeviceForVolume(curDevice) & curStreamDevice) != 0;

            } else {

                applyVolume = !mVolumeCurves->hasVolumeIndexForDevice(

                        stream, curStreamDevice);