commit addc3069bb8e9f417c729adc4184d8f48bbe81ba
author Emilian Peev <epeev@google.com> Thu Jul 26 09:44:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 26 09:44:24 2018 -0700
tree 6afb55db70987de70c11c8e1cfc3c2c2783d423a
parent a156c4fdc6d3f1ea503abc9e21e889bd4e4e546e
parent 8e920568371136b011c79e6c1d15bcb4c047d0a3

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

Change-Id: I9bdda2b5fbd92f6bb0d77f9a4809766f95a8b318

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());
     }
 }