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

Commit f096eca2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: fix stream ID for failed buffer request" into rvc-qpr-dev am: 127b0dba 

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

Change-Id: I011895fbb83506f0049f142c8214073c248d07a5
parents ef2f7cfe 127b0dba

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;