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

Commit 56edc8ac authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "bug fix: during fatal fails bypass freeNode() calls" into oc-mr1-dev 

am: ae62942b

Change-Id: I0d93babc0ce84e3d427ae5adf4afd40d1a46e45b
parents da47be93 ae62942b

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

+4 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    virtual void TearDown() override {

        if (omxNode != nullptr) {

            // If you have encountered a fatal failure, it is possible that

            // freeNode() will not go through. Instead of hanging the app.

            // let it pass through and report errors

            if (::testing::Test::HasFatalFailure()) return;

            EXPECT_TRUE((omxNode->freeNode()).isOk());

            omxNode = nullptr;

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    virtual void TearDown() override {

        if (omxNode != nullptr) {

            // If you have encountered a fatal failure, it is possible that

            // freeNode() will not go through. Instead of hanging the app.

            // let it pass through and report errors

            if (::testing::Test::HasFatalFailure()) return;

            EXPECT_TRUE((omxNode->freeNode()).isOk());

            omxNode = nullptr;

        }

media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    virtual void TearDown() override {

        if (omxNode != nullptr) {

            // If you have encountered a fatal failure, it is possible that

            // freeNode() will not go through. Instead of hanging the app.

            // let it pass through and report errors

            if (::testing::Test::HasFatalFailure()) return;

            EXPECT_TRUE((omxNode->freeNode()).isOk());

            omxNode = nullptr;

        }

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    virtual void TearDown() override {

        if (omxNode != nullptr) {

            // If you have encountered a fatal failure, it is possible that

            // freeNode() will not go through. Instead of hanging the app.

            // let it pass through and report errors

            if (::testing::Test::HasFatalFailure()) return;

            EXPECT_TRUE((omxNode->freeNode()).isOk());

            omxNode = nullptr;

        }

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    virtual void TearDown() override {

        if (omxNode != nullptr) {

            // If you have encountered a fatal failure, it is possible that

            // freeNode() will not go through. Instead of hanging the app.

            // let it pass through and report errors

            if (::testing::Test::HasFatalFailure()) return;

            EXPECT_TRUE((omxNode->freeNode()).isOk());

            omxNode = nullptr;

        }