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

Commit 375ff6a3 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

resolve merge conflicts of b92f1d2e to... 

resolve merge conflicts of b92f1d2e to oreo-mr1-vts-dev am: c0243f2f
am: fedde0ea

Change-Id: I52c92c4cd9a68a5a57ba652e0284f495e912ea37
parents c0a06f34 fedde0ea

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

+10 −0
Original line number Diff line number Diff line
@@ -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;