commit 88d9fda69a8aa38e6852cda0b07ce421f9aa8bc9
author Michael Butler <butlermichael@google.com> Fri Jul 14 22:50:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 14 22:50:56 2017 +0000
tree e05a5335ffd798256af5a05fbf4e40622adea782
parent 6c0b3bee3ccf0d6823f1831cea4b636c8370a209
parent 06f79dbd05af653fbcfa2edbf534d6e2be2a6896

Merge "Added protections to RenderScript VTS class teardown." am: 80002c1ff3
am: 06f79dbd05

Change-Id: Iaab1d98a8096204be8f8153f53074cb772f0e809

renderscript/1.0/vts/functional/VtsHalRenderscriptV1_0TargetTest.cpp

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).