diff options
| author | Michael Butler <butlermichael@google.com> | 2017-07-14 22:46:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 22:46:57 +0000 |
| commit | 06f79dbd05af653fbcfa2edbf534d6e2be2a6896 (patch) | |
| tree | 72105ebb6175be16b179f349a76f7f04a91e1032 /renderscript | |
| parent | d19838d2c4130ab918ac94af3775173bdff46d26 (diff) | |
| parent | 80002c1ff304eb61bd7f1718d56750ecf3ea08a6 (diff) | |
| download | android_hardware_interfaces-06f79dbd05af653fbcfa2edbf534d6e2be2a6896.tar.gz android_hardware_interfaces-06f79dbd05af653fbcfa2edbf534d6e2be2a6896.tar.bz2 android_hardware_interfaces-06f79dbd05af653fbcfa2edbf534d6e2be2a6896.zip | |
Merge "Added protections to RenderScript VTS class teardown."
am: 80002c1ff3
Change-Id: I55d1b0432e87068913a0e40cb72717a3a034b1e7
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 2670b8d09..c6eecd6af 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() { } void RenderscriptHidlTest::TearDown() { - context->contextFinish(); - context->contextDestroy(); + if (context.get() != nullptr) { + context->contextFinish(); + context->contextDestroy(); + } } // A class for test environment setup (kept since this file is a template). |