Merge "Merge android14-tests-dev" into main
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;