Remove PixelModemEventInsight message introduced in aosp/3013976. This represents the path not taken. No trace has ever been recorded using this proto, so it's just going to cause confusion leaving this around. Bug: 335603768 Change-Id: Ia89d2e52aa330446b0239aa95e8c7db1115e1d96
diff --git a/Android.bp b/Android.bp index 09e5942..0170d17 100644 --- a/Android.bp +++ b/Android.bp
@@ -5516,7 +5516,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -6723,7 +6722,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -9938,7 +9936,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -9981,7 +9978,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.gen.cc", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.gen.cc", "external/perfetto/protos/perfetto/trace/track_event/log_message.gen.cc", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.gen.cc", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.gen.cc", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.gen.cc", "external/perfetto/protos/perfetto/trace/track_event/screenshot.gen.cc", @@ -10024,7 +10020,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.gen.h", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.gen.h", "external/perfetto/protos/perfetto/trace/track_event/log_message.gen.h", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.gen.h", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.gen.h", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.gen.h", "external/perfetto/protos/perfetto/trace/track_event/screenshot.gen.h", @@ -10063,7 +10058,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -10105,7 +10099,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -10147,7 +10140,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.pb.cc", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.cc", "external/perfetto/protos/perfetto/trace/track_event/log_message.pb.cc", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.pb.cc", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.pb.cc", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.pb.cc", "external/perfetto/protos/perfetto/trace/track_event/screenshot.pb.cc", @@ -10189,7 +10181,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.pb.h", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.h", "external/perfetto/protos/perfetto/trace/track_event/log_message.pb.h", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.pb.h", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.pb.h", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.pb.h", "external/perfetto/protos/perfetto/trace/track_event/screenshot.pb.h", @@ -10228,7 +10219,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -10271,7 +10261,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.pbzero.cc", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.cc", "external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.cc", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.pbzero.cc", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.cc", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.pbzero.cc", "external/perfetto/protos/perfetto/trace/track_event/screenshot.pbzero.cc", @@ -10314,7 +10303,6 @@ "external/perfetto/protos/perfetto/trace/track_event/counter_descriptor.pbzero.h", "external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.h", "external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.h", - "external/perfetto/protos/perfetto/trace/track_event/pixel_modem.pbzero.h", "external/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h", "external/perfetto/protos/perfetto/trace/track_event/range_of_interest.pbzero.h", "external/perfetto/protos/perfetto/trace/track_event/screenshot.pbzero.h", @@ -10483,7 +10471,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -14902,7 +14889,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto", @@ -16220,7 +16206,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto",
diff --git a/BUILD b/BUILD index d449ef8..99bc615 100644 --- a/BUILD +++ b/BUILD
@@ -5743,7 +5743,6 @@ "protos/perfetto/trace/track_event/counter_descriptor.proto", "protos/perfetto/trace/track_event/debug_annotation.proto", "protos/perfetto/trace/track_event/log_message.proto", - "protos/perfetto/trace/track_event/pixel_modem.proto", "protos/perfetto/trace/track_event/process_descriptor.proto", "protos/perfetto/trace/track_event/range_of_interest.proto", "protos/perfetto/trace/track_event/screenshot.proto",
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto index 49fe238..9d0d775 100644 --- a/protos/perfetto/trace/perfetto_trace.proto +++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -12635,16 +12635,6 @@ // End of protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto -// Begin of protos/perfetto/trace/track_event/pixel_modem.proto - -// Event insights emitted by the Pixel modem. -message PixelModemEventInsight { - // Opaque string containing arguments from the modem. - optional string detokenized_message = 1; -} - -// End of protos/perfetto/trace/track_event/pixel_modem.proto - // Begin of protos/perfetto/trace/track_event/screenshot.proto message Screenshot { @@ -12884,7 +12874,6 @@ 43; optional ChromeActiveProcesses chrome_active_processes = 49; optional Screenshot screenshot = 50; - optional PixelModemEventInsight pixel_modem_event_insight = 51; // This field is used only if the source location represents the function that // executes during this event. @@ -13035,6 +13024,8 @@ } optional LegacyEvent legacy_event = 6; + + reserved 51; } // Default values for fields of all TrackEvents on the same packet sequence.
diff --git a/protos/perfetto/trace/track_event/BUILD.gn b/protos/perfetto/trace/track_event/BUILD.gn index 00a5ff5..c101c46 100644 --- a/protos/perfetto/trace/track_event/BUILD.gn +++ b/protos/perfetto/trace/track_event/BUILD.gn
@@ -35,7 +35,6 @@ "counter_descriptor.proto", "debug_annotation.proto", "log_message.proto", - "pixel_modem.proto", "process_descriptor.proto", "range_of_interest.proto", "screenshot.proto",
diff --git a/protos/perfetto/trace/track_event/track_event.proto b/protos/perfetto/trace/track_event/track_event.proto index f7792f6..fa0be83 100644 --- a/protos/perfetto/trace/track_event/track_event.proto +++ b/protos/perfetto/trace/track_event/track_event.proto
@@ -33,7 +33,6 @@ import "protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto"; import "protos/perfetto/trace/track_event/chrome_user_event.proto"; import "protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto"; -import "protos/perfetto/trace/track_event/pixel_modem.proto"; import "protos/perfetto/trace/track_event/screenshot.proto"; import "protos/perfetto/trace/track_event/source_location.proto"; @@ -258,7 +257,6 @@ 43; optional ChromeActiveProcesses chrome_active_processes = 49; optional Screenshot screenshot = 50; - optional PixelModemEventInsight pixel_modem_event_insight = 51; // This field is used only if the source location represents the function that // executes during this event. @@ -409,6 +407,8 @@ } optional LegacyEvent legacy_event = 6; + + reserved 51; } // Default values for fields of all TrackEvents on the same packet sequence.