Snap for 11041982 from 09b94614a36d45605c99d4f6189e5264145711a0 to mainline-wifi-release
Change-Id: Ib548cc6d2a89da219f6f5b1d35cd1598bd526b58
diff --git a/protos/perfetto/trace/android/network_trace.proto b/protos/perfetto/trace/android/network_trace.proto
index 5fcd28b..c339da4 100644
--- a/protos/perfetto/trace/android/network_trace.proto
+++ b/protos/perfetto/trace/android/network_trace.proto
@@ -55,6 +55,12 @@
// 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 c953e6a..641d263 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -4035,6 +4035,12 @@
// 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 f8c7a43..53cc9e6 100644
--- a/test/cmdline_integrationtest.cc
+++ b/test/cmdline_integrationtest.cc
@@ -852,7 +852,10 @@
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;