commit b7f11aaee670708c2b2b84d035c0c3e0f98a0f5d
author Glenn Kasten <gkasten@google.com> Thu Nov 10 18:52:51 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 10 18:52:52 2016 +0000
tree 2c87f5bd68527dd2eb5c1832a218895f27062232
parent e6054936be7e9d873f19239cb763cd440ff3504c
parent 36010722e097519817b6517ec707e2481866ed83

Merge "Remove executable bit from source file"

tests/camera2/CameraModuleFixture.h

diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h
index 25513af..71d7dd0 100644
--- a/tests/camera2/CameraModuleFixture.h
+++ b/tests/camera2/CameraModuleFixture.h
@@ -74,7 +74,6 @@
     void TearDown() {
         TEST_EXTENSION_FORKING_TEAR_DOWN;
 
-        delete mModule;
         TearDownMixin();
 
         /* important: device must be destructed before closing module,
@@ -85,6 +84,7 @@
             ASSERT_EQ(0, HWModuleHelpers::closeModule(mModule->getDso()))
                 << "Failed to close camera HAL module";
         }
+        delete mModule;
     }
 
     void CreateCamera(int cameraID, /*out*/ sp<CameraDeviceBase> *device) {