mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
Merge "bug fix: during fatal fails bypass freeNode() calls" into oc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ae62942b1c
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user