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

Commit 2f87219f authored by Harish Mahendrakar's avatar Harish Mahendrakar
Browse files

Remove volume_group conversions from PolicyAidlConversion 

Following two methods are defined in both
PolicyAidlConversion.cpp and AidlConversion.cpp

aidl2legacy_int32_t_volume_group_t
legacy2aidl_volume_group_t_int32_t

These are now removed from PolicyAidlConversion

When writing unit tests, audio related libraries are linked
at static libraries and these duplicate defintions throw an
error when linking some tests

Bug: 217292176
Test: Builds

Change-Id: Ie04c7b5734d99eb98af44bb86a27c77d71a3d0bc
parent 261eac80

media/libaudioclient/PolicyAidlConversion.cpp

+0 −10
Original line number Diff line number Diff line
@@ -26,16 +26,6 @@ namespace android { 


using base::unexpected;



ConversionResult<volume_group_t>

aidl2legacy_int32_t_volume_group_t(int32_t aidl) {

    return convertReinterpret<volume_group_t>(aidl);

}



ConversionResult<int32_t>

legacy2aidl_volume_group_t_int32_t(volume_group_t legacy) {

    return convertReinterpret<int32_t>(legacy);

}



ConversionResult<uint32_t>

aidl2legacy_AudioMixType_uint32_t(media::AudioMixType aidl) {

    switch (aidl) {

media/libaudioclient/include/media/PolicyAidlConversion.h

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ 


namespace android {



ConversionResult<volume_group_t>

aidl2legacy_int32_t_volume_group_t(int32_t aidl);

ConversionResult<int32_t>

legacy2aidl_volume_group_t_int32_t(volume_group_t legacy);



ConversionResult<product_strategy_t>

aidl2legacy_int32_t_product_strategy_t(int32_t aidl);

ConversionResult<int32_t>