diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-06 04:41:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-06 04:41:13 +0000 |
commit | 31d5d782914a40274669d5b972abe2dc4df8f04a (patch) | |
tree | a32b2633100dc8f91bdef1995a4118f1b19e11f4 | |
parent | 3ade8e3504c278d892cbeea6999d860ad1a7cf12 (diff) | |
parent | daa8bba59f1ba174c6caea450807cfc083bafdd6 (diff) | |
download | av-temp_319669529.tar.gz |
Merge "libaudiohal: Publish AUX type in proxy effects" into main am: daa8bba59ftemp_319669529
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2988130
Change-Id: I4415e3fc418879e4e9e346826ac0335d7f1fd75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | media/libaudiohal/impl/EffectProxy.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libaudiohal/impl/EffectProxy.cpp b/media/libaudiohal/impl/EffectProxy.cpp index d73a36c2b4..3d9832c4de 100644 --- a/media/libaudiohal/impl/EffectProxy.cpp +++ b/media/libaudiohal/impl/EffectProxy.cpp @@ -207,6 +207,10 @@ Descriptor::Common EffectProxy::buildDescriptorCommon( if (desc.common.flags.volume == Flags::Volume::NONE) { common.flags.volume = Flags::Volume::NONE; } + // set to AUXILIARY if any sub-effect is of AUXILIARY type + if (desc.common.flags.type == Flags::Type::AUXILIARY) { + common.flags.type = Flags::Type::AUXILIARY; + } } // copy type UUID from any of sub-effects, all sub-effects should have same type |