diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-07 16:57:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-07 16:57:34 +0000 |
| commit | b288e591b5546b00c17dc78634c87aeee6af4746 (patch) | |
| tree | 1bca85935788654055cf665af42a53634cef23bf /services/surfaceflinger/FrameTracer/FrameTracer.cpp | |
| parent | 3ee6879e91eb132e0b24e2adefd4d8eae2491a62 (diff) | |
| parent | 38afbfd13622e10b8e74b9c114fa05f30ba480bb (diff) | |
| download | native-b288e591b5546b00c17dc78634c87aeee6af4746.tar.gz | |
Snap for 7803083 from 38afbfd13622e10b8e74b9c114fa05f30ba480bb to mainline-tzdata2-release
Change-Id: Ic05c46aa04f9072b3dc93e023a17408956f14474
Diffstat (limited to 'services/surfaceflinger/FrameTracer/FrameTracer.cpp')
| -rw-r--r-- | services/surfaceflinger/FrameTracer/FrameTracer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/surfaceflinger/FrameTracer/FrameTracer.cpp b/services/surfaceflinger/FrameTracer/FrameTracer.cpp index b986f3844a..2dfb9a9d11 100644 --- a/services/surfaceflinger/FrameTracer/FrameTracer.cpp +++ b/services/surfaceflinger/FrameTracer/FrameTracer.cpp @@ -25,7 +25,7 @@ #include "FrameTracer.h" #include <android-base/stringprintf.h> -#include <perfetto/trace/clock_snapshot.pbzero.h> +#include <perfetto/common/builtin_clock.pbzero.h> #include <algorithm> #include <mutex> @@ -34,7 +34,6 @@ PERFETTO_DEFINE_DATA_SOURCE_STATIC_MEMBERS(android::FrameTracer::FrameTracerData namespace android { -using Clock = perfetto::protos::pbzero::ClockSnapshot::Clock; void FrameTracer::initialize() { std::call_once(mInitializationFlag, [this]() { perfetto::TracingInitArgs args; @@ -136,7 +135,7 @@ void FrameTracer::traceLocked(FrameTracerDataSource::TraceContext& ctx, int32_t uint64_t bufferID, uint64_t frameNumber, nsecs_t timestamp, FrameEvent::BufferEventType type, nsecs_t duration) { auto packet = ctx.NewTracePacket(); - packet->set_timestamp_clock_id(Clock::MONOTONIC); + packet->set_timestamp_clock_id(perfetto::protos::pbzero::BUILTIN_CLOCK_MONOTONIC); packet->set_timestamp(timestamp); auto* event = packet->set_graphics_frame_event()->set_buffer_event(); event->set_buffer_id(static_cast<uint32_t>(bufferID)); |