Snap for 11041982 from 09b94614a36d45605c99d4f6189e5264145711a0 to mainline-uwb-releaseaml_uwb_341310300aml_uwb_341310030android14-mainline-uwb-release

Change-Id: I17b694dc20aff854d8a525032447b941971198ad

3 files changed, 16 insertions, 1 deletions

diff --git a/protos/perfetto/trace/android/network_trace.proto b/protos/perfetto/trace/android/network_trace.proto
index 5fcd28b2b..c339da4f5 100644
--- a/protos/perfetto/trace/android/network_trace.proto
+++ b/protos/perfetto/trace/android/network_trace.proto
@@ -55,6 +55,12 @@ message NetworkPacketEvent {
 
   // The remote udp/tcp port of the packet.
   optional uint32 remote_port = 9;
+
+  // The 1-byte ICMP type identifier.
+  optional uint32 icmp_type = 10;
+
+  // The 1-byte ICMP code identifier.
+  optional uint32 icmp_code = 11;
 }
 
 // NetworkPacketBundle bundles one or more packets sharing the same attributes.
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index c953e6aa8..641d263ea 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -4035,6 +4035,12 @@ message NetworkPacketEvent {
 
   // The remote udp/tcp port of the packet.
   optional uint32 remote_port = 9;
+
+  // The 1-byte ICMP type identifier.
+  optional uint32 icmp_type = 10;
+
+  // The 1-byte ICMP code identifier.
+  optional uint32 icmp_code = 11;
 }
 
 // NetworkPacketBundle bundles one or more packets sharing the same attributes.
diff --git a/test/cmdline_integrationtest.cc b/test/cmdline_integrationtest.cc
index f8c7a43e6..53cc9e6e6 100644
--- a/test/cmdline_integrationtest.cc
+++ b/test/cmdline_integrationtest.cc
@@ -852,7 +852,10 @@ TEST_F(PerfettoCmdlineTest, AndroidOnly(CmdTriggerWithUploadFlag)) {
                                          Eq("trigger_name")))));
 }
 
-TEST_F(PerfettoCmdlineTest, TriggerCloneSnapshot) {
+// This test has been disabled in Android U for CTS tests, because of the
+// (deliberate) breaking change made in aosp/2723034. The proto field ID is also
+// used by the CTS test, which, by design, needs to work on all U releases.
+TEST_F(PerfettoCmdlineTest, DISABLED_TriggerCloneSnapshot) {
   constexpr size_t kMessageCount = 2;
   constexpr size_t kMessageSize = 2;
   protos::gen::TraceConfig trace_config;