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

Commit 214896b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "effect_device_mask" into main am: 271948af 

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



Change-Id: I5cc081f59a050b9ba5f54b037dc4e98be41478ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd0071fc 271948af

services/audioflinger/Effects.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1446,11 +1446,6 @@ void EffectChain::setVolumeForOutput_l(uint32_t left, uint32_t right) 
status_t EffectModule::sendSetAudioDevicesCommand(

        const AudioDeviceTypeAddrVector &devices, uint32_t cmdCode)

{

    // for AIDL, use setDevices to pass the AudioDeviceTypeAddrVector

    if (!EffectConfiguration::isHidl()) {

        return mEffectInterface->setDevices(devices);

    }



    audio_devices_t deviceType = deviceTypesToBitMask(getAudioDeviceTypes(devices));

    if (deviceType == AUDIO_DEVICE_NONE) {

        return NO_ERROR;
@@ -1462,6 +1457,11 @@ status_t EffectModule::sendSetAudioDevicesCommand( 
    }

    status_t status = NO_ERROR;

    if ((mDescriptor.flags & EFFECT_FLAG_DEVICE_MASK) == EFFECT_FLAG_DEVICE_IND) {

        // for AIDL, use setDevices to pass the AudioDeviceTypeAddrVector

        if (!EffectConfiguration::isHidl()) {

            return mEffectInterface->setDevices(devices);

        }



        status_t cmdStatus;

        uint32_t size = sizeof(status_t);

        // FIXME: use audio device types and addresses when the hal interface is ready.