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

Commit a9617e26 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge changes Iec35c735,Ic3238144 am: bf277f37 

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



Change-Id: I825754bc78e2152830c4d2fc71cbe2c36fbdf817
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37ba0178 bf277f37

media/audioaidlconversion/AidlConversionCppNdk.cpp

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ namespace android { 


using ::android::BAD_VALUE;

using ::android::OK;

using ::android::String16;

using ::android::String8;

using ::android::status_t;

using ::android::base::unexpected;



using media::audio::common::AudioChannelLayout;

media/audioaidlconversion/AidlConversionEffect.cpp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ using ::aidl::android::media::audio::common::AudioDeviceDescription; 


using ::android::BAD_VALUE;

using ::android::OK;

using ::android::status_t;

using ::android::base::unexpected;

using ::android::effect::utils::EffectParamReader;

using ::android::effect::utils::EffectParamWriter;

media/audioaidlconversion/include/media/AidlConversionCppNdk-impl.h

0 → 100644
+433 −0

File added.

Preview size limit exceeded, changes collapsed.

media/audioaidlconversion/include/media/AidlConversionCppNdk.h

+10 −403

File changed.

Preview size limit exceeded, changes collapsed.

media/audioaidlconversion/include/media/AidlConversionUtil-impl.h

0 → 100644
+438 −0

File added.

Preview size limit exceeded, changes collapsed.