| commit | f706af8d57d0cd64cb5ef03f14003f374eaff27e | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Fri Jul 14 23:01:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 14 23:01:43 2017 +0000 |
| tree | 8a82672738642a7380ccfa0abccb543d4fd0aaa7 | |
| parent | e5e1158fe12162ba567718166bde3cfb3539085c [diff] | |
| parent | 5cc58a7699fad56b573b2d852575ab67598397d9 [diff] |
Merge "Added protections to RenderScript VTS class teardown." am: 80002c1ff3 am: 06f79dbd05 am: 88d9fda69a am: 5cc58a7699 Change-Id: If28246fe60aa1f3cf24da4c4668cc91b347abbbc
diff --git a/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp b/renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp index 2670b8d..c6eecd6 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::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).