commit c87315d8835662eb6d4e57bb688ba536e5da860b
author Shuzhen Wang <shuzhenwang@google.com> Thu Mar 17 00:11:20 2022 +0000
committer Shuzhen Wang <shuzhenwang@google.com> Thu Mar 17 00:11:20 2022 +0000
tree 9dfbca0b5b15e74e1912f24c2aff36e17874985c
parent 2bb11bb2394e207d793962803b763412f7320c84

Camera: Call corresponding unlock for every lockAsync

unlock needs to be called in both success and error conditions.

Bug: 224986966
Test: Vendor testing
Change-Id: Ia664a256504243784c849fbfc82cf94d955258f0

services/camera/libcameraservice/api2/DepthCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/DepthCompositeStream.cpp b/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
index a66a592..aa057c7 100644
--- a/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/DepthCompositeStream.cpp
@@ -297,7 +297,8 @@
     }
 
     sp<GraphicBuffer> gb = GraphicBuffer::from(anb);
-    res = gb->lockAsync(GRALLOC_USAGE_SW_WRITE_OFTEN, &dstBuffer, fenceFd);
+    GraphicBufferLocker gbLocker(gb);
+    res = gbLocker.lockAsync(&dstBuffer, fenceFd);
     if (res != OK) {
         ALOGE("%s: Error trying to lock output buffer fence: %s (%d)", __FUNCTION__,
                 strerror(-res), res);