| commit | 26bb53def876109b6046b33d9695a51cc9250de1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 07 19:08:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 07 19:08:24 2020 +0000 |
| tree | 1944464b753b39c5f5ae9e136af1fb9160653029 | |
| parent | d0cc5ece354515f04cd6ac8359f333d864ebbb48 [diff] | |
| parent | 2b7dd0efbd20d88e4751eb9d1d6a073af9ef1b07 [diff] |
Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0efbd Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1518018 Change-Id: I4a15057e182c708f34d060ab3b17fee4f2a8b83b
diff --git a/media/libmediahelper/tests/typeconverter_tests.cpp b/media/libmediahelper/tests/typeconverter_tests.cpp index ab55c13..0c3b913 100644 --- a/media/libmediahelper/tests/typeconverter_tests.cpp +++ b/media/libmediahelper/tests/typeconverter_tests.cpp
@@ -19,14 +19,14 @@ #define LOG_TAG "TypeConverter_Test" #include <log/log.h> -#include <audio_policy_configuration_V7_0.h> +#include <android_audio_policy_configuration_V7_0.h> #include <media/TypeConverter.h> #include <system/audio.h> #include <xsdc/XsdcSupport.h> using namespace android; namespace xsd { -using namespace audio::policy::configuration::V7_0; +using namespace android::audio::policy::configuration::V7_0; } TEST(TypeConverter, ParseChannelMasks) {