diff options
| author | Michael Butler | 2017-07-14 17:54:58 -0500 |
|---|---|---|
| committer | android-build-merger | 2017-07-14 17:54:58 -0500 |
| commit | 5cc58a7699fad56b573b2d852575ab67598397d9 (patch) | |
| tree | 68ddfcf0650d78a16d8cf20751d1711398a1e837 /renderscript | |
| parent | 3bbf0c19d2a2f00c5d59a56d292a624cf5ac36a3 (diff) | |
| parent | 88d9fda69a8aa38e6852cda0b07ce421f9aa8bc9 (diff) | |
| download | platform-hardware-interfaces-5cc58a7699fad56b573b2d852575ab67598397d9.tar.gz platform-hardware-interfaces-5cc58a7699fad56b573b2d852575ab67598397d9.tar.xz platform-hardware-interfaces-5cc58a7699fad56b573b2d852575ab67598397d9.zip | |
Merge "Added protections to RenderScript VTS class teardown." am: 80002c1ff3 am: 06f79dbd05
am: 88d9fda69a
Change-Id: I5610aa46a612acbd3b854de9721fd4c204a2f5f0
Diffstat (limited to 'renderscript')
| -rw-r--r-- | renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp index 2670b8d0..c6eecd6a 100644 --- a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp +++ b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp | |||
| @@ -28,8 +28,10 @@ void RenderscriptHidlTest::SetUp() { | |||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | void RenderscriptHidlTest::TearDown() { | 30 | void RenderscriptHidlTest::TearDown() { |
| 31 | context->contextFinish(); | 31 | if (context.get() != nullptr) { |
| 32 | context->contextDestroy(); | 32 | context->contextFinish(); |
| 33 | context->contextDestroy(); | ||
| 34 | } | ||
| 33 | } | 35 | } |
| 34 | 36 | ||
| 35 | // A class for test environment setup (kept since this file is a template). | 37 | // A class for test environment setup (kept since this file is a template). |