Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 457b3940 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

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
parent df0d876e

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1218,13 +1218,13 @@ void requestStreamBuffers(RequestBufferStates& states, 
            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;