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

Commit 2685aa09 authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: fix default stream and source effects 

Fixed AudioPolicyEffects::addSourceDefaultEffect() and
AudioPolicyEffects::addStreamDefaultEffect() for the case where
not both effect type and uuid are provided.
Use the type and uuid in the descriptor retrieved from the
effect implementation instead of the ones provided as argument when
creating the effect entry.

Test: atest audioeffect_tests:DefaultEffectTest#ManageSourceDefaultEffects
Test: atest audioeffect_tests:DefaultEffectTest#ManageStreamDefaultEffects

Change-Id: Iaf9311967aa0b91c66dd2ff0f136ff744a6642d8
parent 0fe05c41

services/audiopolicy/service/AudioPolicyEffects.cpp

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ status_t AudioPolicyEffects::addSourceDefaultEffect(const effect_uuid_t *type, 
        return res;

    }

    EffectDesc *effect = new EffectDesc(

            descriptor.name, *type, opPackageName, *uuid, priority, *id);

            descriptor.name, descriptor.type, opPackageName, descriptor.uuid, priority, *id);

    desc->mEffects.add(effect);

    // TODO(b/71813697): Support setting params as well.
@@ -452,7 +452,7 @@ status_t AudioPolicyEffects::addStreamDefaultEffect(const effect_uuid_t *type, 
        return res;

    }

    EffectDesc *effect = new EffectDesc(

            descriptor.name, *type, opPackageName, *uuid, priority, *id);

            descriptor.name, descriptor.type, opPackageName, descriptor.uuid, priority, *id);

    desc->mEffects.add(effect);

    // TODO(b/71813697): Support setting params as well.