commit 2685aa098ae8dd7eb4e512950d54de11a9a4ed39
author Eric Laurent <elaurent@google.com> Tue Feb 01 14:26:38 2022 +0100
committer Eric Laurent <elaurent@google.com> Tue Feb 01 14:33:06 2022 +0100
tree 492942eef456299fcdcd4452d7bc8f754a922cf5
parent 0fe05c417b4437e09aceb75fa7c647d61b1a0d74

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

services/audiopolicy/service/AudioPolicyEffects.cpp

diff --git a/services/audiopolicy/service/AudioPolicyEffects.cpp b/services/audiopolicy/service/AudioPolicyEffects.cpp
index 858a3fd..70fdfcb 100644
--- a/services/audiopolicy/service/AudioPolicyEffects.cpp
+++ b/services/audiopolicy/service/AudioPolicyEffects.cpp
@@ -387,7 +387,7 @@
         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 @@
         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.