commit 8779d083464f7d104fbb128c174ef7694aa26c4b
author Priyanka Advani <padvani@google.com> Mon Jun 10 19:07:02 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 10 19:07:06 2024 +0000
tree 948614d6e5a4522728cbdb3791b7bebbcc606b91
parent ff517071a4b45ac6546bdf5770582881c183a286

Revert "AndroidInputEvent: Migrate from TracePacket to WinscopeE..."

Revert submission 27683745-migrate-input-trace-winscope

Reason for revert: Droidmonitor created revert due to b/346371417. 

Reverted changes: /q/submissionid:27683745-migrate-input-trace-winscope

Change-Id: Ice87da2681a76b47d582c7ce957c598bb8c7fdb9

services/inputflinger/dispatcher/Android.bp

diff --git a/services/inputflinger/dispatcher/Android.bp b/services/inputflinger/dispatcher/Android.bp
index 1a0ec48..29aa3c3 100644
--- a/services/inputflinger/dispatcher/Android.bp
+++ b/services/inputflinger/dispatcher/Android.bp
@@ -56,9 +56,7 @@
 
 cc_defaults {
     name: "libinputdispatcher_defaults",
-    srcs: [
-        ":libinputdispatcher_sources",
-    ],
+    srcs: [":libinputdispatcher_sources"],
     shared_libs: [
         "libbase",
         "libbinder",
@@ -80,7 +78,6 @@
         "libattestation",
         "libgui_window_info_static",
         "libperfetto_client_experimental",
-        "perfetto_winscope_extensions_zero",
     ],
     target: {
         android: {

services/inputflinger/dispatcher/trace/InputTracingPerfettoBackend.cpp

diff --git a/services/inputflinger/dispatcher/trace/InputTracingPerfettoBackend.cpp b/services/inputflinger/dispatcher/trace/InputTracingPerfettoBackend.cpp
index 3d30ad6..9b9633a 100644
--- a/services/inputflinger/dispatcher/trace/InputTracingPerfettoBackend.cpp
+++ b/services/inputflinger/dispatcher/trace/InputTracingPerfettoBackend.cpp
@@ -23,8 +23,6 @@
 #include <android-base/logging.h>
 #include <binder/IServiceManager.h>
 #include <perfetto/trace/android/android_input_event.pbzero.h>
-#include <perfetto/trace/android/winscope_extensions.pbzero.h>
-#include <perfetto/trace/android/winscope_extensions_impl.pbzero.h>
 #include <private/android_filesystem_config.h>
 #include <utils/String16.h>
 
@@ -231,9 +229,7 @@
         }
         const bool isRedacted = traceLevel == TraceLevel::TRACE_LEVEL_REDACTED;
         auto tracePacket = ctx.NewTracePacket();
-        auto* winscopeExtensions = static_cast<perfetto::protos::pbzero::WinscopeExtensionsImpl*>(
-                tracePacket->set_winscope_extensions());
-        auto* inputEvent = winscopeExtensions->set_android_input_event();
+        auto* inputEvent = tracePacket->set_android_input_event();
         auto* dispatchMotion = isRedacted ? inputEvent->set_dispatcher_motion_event_redacted()
                                           : inputEvent->set_dispatcher_motion_event();
         AndroidInputEventProtoConverter::toProtoMotionEvent(event, *dispatchMotion, isRedacted);
@@ -257,9 +253,7 @@
         }
         const bool isRedacted = traceLevel == TraceLevel::TRACE_LEVEL_REDACTED;
         auto tracePacket = ctx.NewTracePacket();
-        auto* winscopeExtensions = static_cast<perfetto::protos::pbzero::WinscopeExtensionsImpl*>(
-                tracePacket->set_winscope_extensions());
-        auto* inputEvent = winscopeExtensions->set_android_input_event();
+        auto* inputEvent = tracePacket->set_android_input_event();
         auto* dispatchKey = isRedacted ? inputEvent->set_dispatcher_key_event_redacted()
                                        : inputEvent->set_dispatcher_key_event();
         AndroidInputEventProtoConverter::toProtoKeyEvent(event, *dispatchKey, isRedacted);
@@ -283,9 +277,7 @@
         }
         const bool isRedacted = traceLevel == TraceLevel::TRACE_LEVEL_REDACTED;
         auto tracePacket = ctx.NewTracePacket();
-        auto* winscopeExtensions = static_cast<perfetto::protos::pbzero::WinscopeExtensionsImpl*>(
-                tracePacket->set_winscope_extensions());
-        auto* inputEvent = winscopeExtensions->set_android_input_event();
+        auto* inputEvent = tracePacket->set_android_input_event();
         auto* dispatchEvent = isRedacted
                 ? inputEvent->set_dispatcher_window_dispatch_event_redacted()
                 : inputEvent->set_dispatcher_window_dispatch_event();