commit eb83a2b74e7c6a568b82f19a4aed0e1225572aca
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Jul 14 21:58:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 14 21:58:37 2020 +0000
tree 970f23206e575eadc8a4a18161a7a65f523f13be
parent fd601b72aeed866231c5fe6240a3f375c2c85059
parent ee2d104677edb8b20f9d366c39ff4163c75b7f0f

RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request am: ee2d104677

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1361250

Change-Id: I79d24d91657a42425adc8cdab05846394adbe92b

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index dfe5eb0..ed5acd8 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1048,13 +1048,13 @@
             return hardware::Void();
         }
 
+        bufRet.streamId = streamId;
         if (outputStream->isAbandoned()) {
             bufRet.val.error(StreamBufferRequestError::STREAM_DISCONNECTED);
             allReqsSucceeds = false;
             continue;
         }
 
-        bufRet.streamId = streamId;
         size_t handOutBufferCount = outputStream->getOutstandingBuffersCount();
         uint32_t numBuffersRequested = bufReq.numBuffersRequested;
         size_t totalHandout = handOutBufferCount + numBuffersRequested;