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

Commit eb83a2b7 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I79d24d91657a42425adc8cdab05846394adbe92b
parents fd601b72 ee2d1046

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1048,13 +1048,13 @@ hardware::Return<void> Camera3Device::requestStreamBuffers( 
            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;