commit 69b92a456cc71e8839d9ca597e367c0c4ae59a7b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 25 01:12:08 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 25 01:12:08 2023 +0000
tree eba68f25281e474821e15059ac2d9e3f08e199d4
parent 54d3db41938d54824638714beea2f696d3fad71a
parent 778d58485d13db0a8089fd0d4ef593d9f48deb97

Snap for 9815530 from 778d58485d13db0a8089fd0d4ef593d9f48deb97 to tm-qpr3-release

Change-Id: Iee905a30038a457e1547f3569dcbe19712c357a7

src/perfetto_cmd/perfetto_cmd.cc

diff --git a/src/perfetto_cmd/perfetto_cmd.cc b/src/perfetto_cmd/perfetto_cmd.cc
index 3ed3140..8c84802 100644
--- a/src/perfetto_cmd/perfetto_cmd.cc
+++ b/src/perfetto_cmd/perfetto_cmd.cc
@@ -1002,7 +1002,8 @@
   }
 
   PERFETTO_DCHECK(trace_config_);
-  trace_config_->set_enable_extra_guardrails(save_to_incidentd_);
+  trace_config_->set_enable_extra_guardrails(save_to_incidentd_ ||
+                                             report_to_android_framework_);
 
   // Set the statsd logging flag if we're uploading