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

Commit 66e630b8 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

Skip setDevice to HAL for AUDIO_DEVICE_NONE 

Flag: EXEMPT bugfix
Bug: 399565043
Test: atest CtsMediaAudioTestCases
Change-Id: I1854daf8b8ccddaa3f883afb3ddada1be77c3cc3
Merged-In: I1854daf8b8ccddaa3f883afb3ddada1be77c3cc3
parent cfe25a8d

services/audioflinger/Effects.cpp

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

status_t EffectModule::sendSetAudioDevicesCommand(

        const AudioDeviceTypeAddrVector &devices, uint32_t cmdCode)

        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));

    audio_devices_t deviceType = deviceTypesToBitMask(getAudioDeviceTypes(devices));

    if (deviceType == AUDIO_DEVICE_NONE) {

    if (deviceType == AUDIO_DEVICE_NONE) {

        return NO_ERROR;

        return NO_ERROR;
@@ -1464,6 +1459,11 @@ status_t EffectModule::sendSetAudioDevicesCommand( 
    }

    }

    status_t status = NO_ERROR;

    status_t status = NO_ERROR;

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

    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;

        status_t cmdStatus;

        uint32_t size = sizeof(status_t);

        uint32_t size = sizeof(status_t);

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

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