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

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

Merge changes I34db56fe,I539b408f,I76155f89 into udc-qpr-dev am: 83dcb849 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24816701



Change-Id: Ieaf64d15383104f0200dbd2c97a177762a0061ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6a82126 83dcb849

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+6 −6
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ using ndk::ScopedAStatus; 


using aidl::android::hardware::audio::effect::CommandId;

using aidl::android::hardware::audio::effect::Descriptor;

using aidl::android::hardware::audio::effect::Flags;

using aidl::android::hardware::audio::effect::IEffect;

using aidl::android::hardware::audio::effect::IFactory;

using aidl::android::hardware::audio::effect::Parameter;

using aidl::android::hardware::audio::effect::State;

using aidl::android::hardware::audio::effect::Flags;

using aidl::android::media::audio::common::AudioDeviceDescription;

using aidl::android::media::audio::common::AudioDeviceType;

using aidl::android::media::audio::common::AudioMode;

audio/aidl/vts/TestUtils.h

+5 −5

File changed.

Contains only whitespace changes.