resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev

Test: make vts -j123 && vts-tradefed run commandAndExit vts \
--skip-all-system-status-check \
--skip-preconditions -m VtsHalMediaOmxV1_0Host \
-l INFO

Bug: 70933963
Change-Id: I38f6309b638e604403dba15fa1fe1022b298c5b2
This commit is contained in:
Pawin Vongmasa
2018-07-11 23:22:17 -07:00

View File

@@ -225,6 +225,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";
}
@@ -321,6 +330,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;