diff options
author | Ram Mohan M | 2017-10-17 18:04:36 -0500 |
---|---|---|
committer | android-build-merger | 2017-10-17 18:04:36 -0500 |
commit | 7f775013317d48d8b7bcf0ca723a9e3c01610d0d (patch) | |
tree | 20810b028dc22c1a3031f4b57d5a4fd447a87dd3 /media/omx/1.0 | |
parent | c496974404160d33bcb00f83d80bd3f972345393 (diff) | |
parent | 56edc8ac66d840982adc407e42c29df5129653a6 (diff) | |
download | platform-hardware-interfaces-7f775013317d48d8b7bcf0ca723a9e3c01610d0d.tar.gz platform-hardware-interfaces-7f775013317d48d8b7bcf0ca723a9e3c01610d0d.tar.xz platform-hardware-interfaces-7f775013317d48d8b7bcf0ca723a9e3c01610d0d.zip |
Merge "bug fix: during fatal fails bypass freeNode() calls" into oc-mr1-dev am: ae62942b1c
am: 56edc8ac66
Change-Id: Ic208c8ea548e559b5e553e639227a50da01d0d2f
Diffstat (limited to 'media/omx/1.0')
5 files changed, 20 insertions, 0 deletions
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index 9e185f27..38cdcd65 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp | |||
@@ -230,6 +230,10 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
230 | 230 | ||
231 | virtual void TearDown() override { | 231 | virtual void TearDown() override { |
232 | if (omxNode != nullptr) { | 232 | if (omxNode != nullptr) { |
233 | // If you have encountered a fatal failure, it is possible that | ||
234 | // freeNode() will not go through. Instead of hanging the app. | ||
235 | // let it pass through and report errors | ||
236 | if (::testing::Test::HasFatalFailure()) return; | ||
233 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 237 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
234 | omxNode = nullptr; | 238 | omxNode = nullptr; |
235 | } | 239 | } |
diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp index d8724449..953dc750 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp | |||
@@ -216,6 +216,10 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
216 | 216 | ||
217 | virtual void TearDown() override { | 217 | virtual void TearDown() override { |
218 | if (omxNode != nullptr) { | 218 | if (omxNode != nullptr) { |
219 | // If you have encountered a fatal failure, it is possible that | ||
220 | // freeNode() will not go through. Instead of hanging the app. | ||
221 | // let it pass through and report errors | ||
222 | if (::testing::Test::HasFatalFailure()) return; | ||
219 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 223 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
220 | omxNode = nullptr; | 224 | omxNode = nullptr; |
221 | } | 225 | } |
diff --git a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp index 401e54ab..d66136d2 100644 --- a/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp +++ b/media/omx/1.0/vts/functional/component/VtsHalMediaOmxV1_0TargetComponentTest.cpp | |||
@@ -191,6 +191,10 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
191 | 191 | ||
192 | virtual void TearDown() override { | 192 | virtual void TearDown() override { |
193 | if (omxNode != nullptr) { | 193 | if (omxNode != nullptr) { |
194 | // If you have encountered a fatal failure, it is possible that | ||
195 | // freeNode() will not go through. Instead of hanging the app. | ||
196 | // let it pass through and report errors | ||
197 | if (::testing::Test::HasFatalFailure()) return; | ||
194 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 198 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
195 | omxNode = nullptr; | 199 | omxNode = nullptr; |
196 | } | 200 | } |
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index 667c2e12..9b74a339 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | |||
@@ -232,6 +232,10 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
232 | 232 | ||
233 | virtual void TearDown() override { | 233 | virtual void TearDown() override { |
234 | if (omxNode != nullptr) { | 234 | if (omxNode != nullptr) { |
235 | // If you have encountered a fatal failure, it is possible that | ||
236 | // freeNode() will not go through. Instead of hanging the app. | ||
237 | // let it pass through and report errors | ||
238 | if (::testing::Test::HasFatalFailure()) return; | ||
235 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 239 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
236 | omxNode = nullptr; | 240 | omxNode = nullptr; |
237 | } | 241 | } |
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp index 743ff787..099658f8 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp | |||
@@ -243,6 +243,10 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
243 | 243 | ||
244 | virtual void TearDown() override { | 244 | virtual void TearDown() override { |
245 | if (omxNode != nullptr) { | 245 | if (omxNode != nullptr) { |
246 | // If you have encountered a fatal failure, it is possible that | ||
247 | // freeNode() will not go through. Instead of hanging the app. | ||
248 | // let it pass through and report errors | ||
249 | if (::testing::Test::HasFatalFailure()) return; | ||
246 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 250 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
247 | omxNode = nullptr; | 251 | omxNode = nullptr; |
248 | } | 252 | } |