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

Commit 8eebba44 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Sf Tracing: Set a valid/fired acquire fence 

Fixes a NPE with acquire fence issues when generating layers trace
from transaction traces.

Bug: 200284593
Test: atest transactiontrace_testsuite

Change-Id: I7e07b5a84af097a53927635ec83226f850d5a9e6
parent 4e293cd2

services/surfaceflinger/Tracing/TransactionProtoParser.cpp

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <gui/SurfaceComposerClient.h>

#include <ui/Fence.h>

#include <ui/Rect.h>



#include "LayerProtoHelper.h"
@@ -431,6 +432,7 @@ void TransactionProtoParser::fromProto(const proto::LayerState& proto, layer_sta 
        layer.bufferData->frameNumber = bufferProto.frame_number();

        layer.bufferData->flags = Flags<BufferData::BufferDataChange>(bufferProto.flags());

        layer.bufferData->cachedBuffer.id = bufferProto.cached_buffer_id();

        layer.bufferData->acquireFence = Fence::NO_FENCE;

    }



    if (proto.what() & layer_state_t::eApiChanged) {

services/surfaceflinger/Tracing/tools/LayerTraceGenerator.cpp

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ public: 
bool LayerTraceGenerator::generate(const proto::TransactionTraceFile& traceFile,

                                   const char* outputLayersTracePath) {

    if (traceFile.entry_size() == 0) {

        ALOGD("Trace file is empty");

        return false;

    }