commit 457b39409eb86c4a572dd7fe4bec2844eaa3ee7c
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Jul 14 11:35:48 2020 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Jul 14 21:52:04 2020 +0000
tree 4e7dd48c458fcdb2e66c7277498b8bc14886bb74
parent df0d876e6649f0452b84a19c407c7dec7538ec0c

Camera: fix stream ID for failed buffer request

The ID was not filled for disconnected streams.

Test: Camera CTS tests on flame
Bug: 160255243
Merged-In: I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684
Change-Id: I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
index eea5ef1..08cde5d 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@@ -1218,13 +1218,13 @@
             return;
         }
 
+        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;