tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev am: c0243f2ff8

Browse source 
am: 841940be1c

Change-Id: Ia75038ed63e5f69b81a8184a0c79ffeda55a63c4
This commit is contained in:
Pawin Vongmasa 2018-08-10 14:57:43 -07:00 committed by android-build-merger
commit 256167f706
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp
View file

@ -151,6 +151,15 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
framesReceived = 0;
timestampUs = 0;
timestampDevTest = false;
isSecure = false;
size_t suffixLen = strlen(".secure");
if (strlen(gEnv->getComponent().c_str()) >= suffixLen) {
isSecure =
!strcmp(gEnv->getComponent().c_str() +
strlen(gEnv->getComponent().c_str()) - suffixLen,
".secure");
}
if (isSecure) disableTest = true;
if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
}
@ -247,6 +256,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
OMX_AUDIO_CODINGTYPE eEncoding;
bool disableTest;
bool eosFlag;
bool isSecure;
uint32_t framesReceived;
uint64_t timestampUs;
::android::List<uint64_t> timestampUslist;