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

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

Merge "Updating typeconverter_tests audio_policy_configuration import" am:... 

Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0ef am: 26bb53de

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

Change-Id: Icfe8a008386e8deab44bbe4d2ae933ae17db5282
parents 142100a4 26bb53de

media/libmediahelper/tests/typeconverter_tests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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) {