InputTracer: Introduce TracedEventArgs to track secure events
Introduce TracedEventArgs to give the tracing backend additional
information about the traced event.
We start by tracking whether an event is secure. An event is marked as
secure if it is targeting at least one secure window.
For now, do not trace secure events in the perfetto backend.
Bug: 210460522
Test: manual with perfetto
Change-Id: I41648d769319e47486556d0a2d6b8f02142048d2
diff --git a/services/inputflinger/dispatcher/trace/ThreadedBackend.h b/services/inputflinger/dispatcher/trace/ThreadedBackend.h
index 5776cf9..5d4efbb 100644
--- a/services/inputflinger/dispatcher/trace/ThreadedBackend.h
+++ b/services/inputflinger/dispatcher/trace/ThreadedBackend.h
@@ -38,9 +38,9 @@
ThreadedBackend(Backend&& innerBackend);
~ThreadedBackend() override;
- void traceKeyEvent(const TracedKeyEvent&) override;
- void traceMotionEvent(const TracedMotionEvent&) override;
- void traceWindowDispatch(const WindowDispatchArgs&) override;
+ void traceKeyEvent(const TracedKeyEvent&, const TracedEventArgs&) override;
+ void traceMotionEvent(const TracedMotionEvent&, const TracedEventArgs&) override;
+ void traceWindowDispatch(const WindowDispatchArgs&, const TracedEventArgs&) override;
private:
std::mutex mLock;
@@ -48,7 +48,9 @@
bool mThreadExit GUARDED_BY(mLock){false};
std::condition_variable mThreadWakeCondition;
Backend mBackend;
- using TraceEntry = std::variant<TracedKeyEvent, TracedMotionEvent, WindowDispatchArgs>;
+ using TraceEntry =
+ std::pair<std::variant<TracedKeyEvent, TracedMotionEvent, WindowDispatchArgs>,
+ TracedEventArgs>;
std::vector<TraceEntry> mQueue GUARDED_BY(mLock);
using WindowDispatchArgs = InputTracingBackendInterface::WindowDispatchArgs;