| commit | bbd0c01fe61bd1d28d847c497c98566e94cbb8b4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 07 19:21:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 07 19:21:23 2020 +0000 |
| tree | b88012349f57db9fd15d98c5a4ab2494f433111d | |
| parent | 142100a49ef2ad00dafac043e6c066295ad716b7 [diff] | |
| parent | 26bb53def876109b6046b33d9695a51cc9250de1 [diff] |
Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0efbd am: 26bb53def8 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1518018 Change-Id: Icfe8a008386e8deab44bbe4d2ae933ae17db5282
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) {