commit 3aace138e9f52056f293f0bf5b430bbcb257ef4e
author Emilian Peev <epeev@google.com> Thu Jul 26 09:47:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 26 09:47:27 2018 -0700
tree 1f3251bae1ffde5ce1fbc48c46cf4c6c3eea774f
parent 3528bab7639a3d6b9a8b7235e902ca0d38ff2d2f
parent addc3069bb8e9f417c729adc4184d8f48bbe81ba

Camera: Don't hold 'mLock' when closing the camera session am: 8e92056837
am: addc3069bb

Change-Id: I79b201eea2bc097438219eb99627e93989954655

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 1a245c4..439333d 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -4046,10 +4046,10 @@
                                << static_cast<uint32_t>(inflightReq.errorCode);
                 }
             }
-
-            ret = session->close();
-            ASSERT_TRUE(ret.isOk());
         }
+
+        ret = session->close();
+        ASSERT_TRUE(ret.isOk());
     }
 }