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

Commit 1f113da8 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Fix RequestedLayerState logging for out of order buffers" into main

parents a5ac1e54 0db92f14

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void RequestedLayerState::merge(const ResolvedComposerState& resolvedComposerSta 
                 (barrierFrameNumber > bufferData->frameNumber))) {

                ALOGE("Out of order buffers detected for %s producedId=%d frameNumber=%" PRIu64

                      " -> producedId=%d frameNumber=%" PRIu64,

                      getDebugString().c_str(), bufferData->producerId, bufferData->frameNumber,

                      getDebugString().c_str(), barrierProducerId, barrierFrameNumber,

                      bufferData->producerId, frameNumber);

                TransactionTraceWriter::getInstance().invoke("out_of_order_buffers_",

                                                             /*overwrite=*/false);
@@ -401,6 +401,7 @@ std::string RequestedLayerState::getDebugString() const { 
    if (!handleAlive) debug << " !handle";

    if (z != 0) debug << " z=" << z;

    if (layerStack.id != 0) debug << " layerStack=" << layerStack.id;

    debug << "}";

    return debug.str();

}