mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:23:37 +00:00
resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev am: c0243f2ff8
am: fedde0ea52
Change-Id: I52c92c4cd9a68a5a57ba652e0284f495e912ea37
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user