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

Commit c1d45fdd authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Fix unintended buffer canceling" am: ec9c339b am: 932910e2 am: 9afefc81 am: fa2dafec 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2304872



Change-Id: I97e6b3303951277cfa8ad47bccde400d842a6811
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae20369c fa2dafec

libs/gui/Surface.cpp

+7 −3
Original line number Diff line number Diff line
@@ -793,11 +793,15 @@ int Surface::dequeueBuffers(std::vector<BatchBuffer>* buffers) { 
        return result;

    }



    std::vector<CancelBufferInput> cancelBufferInputs(numBufferRequested);

    std::vector<CancelBufferInput> cancelBufferInputs;

    cancelBufferInputs.reserve(numBufferRequested);

    std::vector<status_t> cancelBufferOutputs;

    for (size_t i = 0; i < numBufferRequested; i++) {

        cancelBufferInputs[i].slot = dequeueOutput[i].slot;

        cancelBufferInputs[i].fence = dequeueOutput[i].fence;

        if (dequeueOutput[i].result >= 0) {

            CancelBufferInput& input = cancelBufferInputs.emplace_back();

            input.slot = dequeueOutput[i].slot;

            input.fence = dequeueOutput[i].fence;

        }

    }



    for (const auto& output : dequeueOutput) {