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

Commit f850c8bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove volume_group conversions from PolicyAidlConversion" am: d54de2f1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1964944

Change-Id: Ia16deee5c1d75a49babc2d35fdc51a29f187418a
parents 0c2cf568 d54de2f1

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>