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

Commit 80f35a97 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

audio policy: fix multiple device volume automerge: 31551f8d 

automerge: 4a9e7a0e

* commit '4a9e7a0e':
  audio policy: fix multiple device volume
parents 1d302303 4a9e7a0e

services/audiopolicy/AudioPolicyManager.cpp

+8 −2
Original line number Diff line number Diff line
@@ -1584,12 +1584,17 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
    }

    mStreams[stream].mIndexCur.add(device, index);



    // compute and apply stream volume on all outputs according to connected device

    // update volume on all outputs whose current device is also selected by the same

    // strategy as the device specified by the caller

    audio_devices_t strategyDevice = getDeviceForStrategy(getStrategy(stream), true /*fromCache*/);

    if ((device != AUDIO_DEVICE_OUT_DEFAULT) && (device & strategyDevice) == 0) {

        return NO_ERROR;

    }

    status_t status = NO_ERROR;

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

        audio_devices_t curDevice =

                getDeviceForVolume(mOutputs.valueAt(i)->device());

        if ((device == AUDIO_DEVICE_OUT_DEFAULT) || (device == curDevice)) {

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

            status_t volStatus = checkAndSetVolume(stream, index, mOutputs.keyAt(i), curDevice);

            if (volStatus != NO_ERROR) {

                status = volStatus;
@@ -4252,6 +4257,7 @@ uint32_t AudioPolicyManager::checkDeviceMuteStrategies(sp<AudioOutputDescriptor> 


    for (size_t i = 0; i < NUM_STRATEGIES; i++) {

        audio_devices_t curDevice = getDeviceForStrategy((routing_strategy)i, false /*fromCache*/);

        curDevice = curDevice & outputDesc->mProfile->mSupportedDevices.types();

        bool mute = shouldMute && (curDevice & device) && (curDevice != device);

        bool doMute = false;