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

Commit 70cc6ff8 authored by Kwangkyu Park's avatar Kwangkyu Park
Browse files

Fix unintended buffer canceling 

If 'batched dequeue' fails Surface reverts by calling batched cancel
buffer. However, 'slot' has meaningless information as 'batched dequeue'
failed in the previous step. It leads to the unintended buffer canceling
on the slot 0, if the transaction involves H2B/B2H converter.

Bug: 259493167
Test: atest libgui_test
Change-Id: Ia29605fe1e26ef00b94cc6c08a2310b9c095567f
parent 04d05a69

libs/gui/Surface.cpp

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

        return result;

    }

    }





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

    std::vector<CancelBufferInput> cancelBufferInputs;

    cancelBufferInputs.reserve(numBufferRequested);

    std::vector<status_t> cancelBufferOutputs;

    std::vector<status_t> cancelBufferOutputs;

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

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

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

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

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

            CancelBufferInput& input = cancelBufferInputs.emplace_back();

            input.slot = dequeueOutput[i].slot;

            input.fence = dequeueOutput[i].fence;

        }

    }

    }





    for (const auto& output : dequeueOutput) {

    for (const auto& output : dequeueOutput) {