commit 05cd4b895e5d78ef82448cb9bf71fba6b1ad48ae
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 24 00:00:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 00:00:13 2018 +0000
tree 217282da512b0f30837f55d75901cfd7ee002c64
parent dabc529df408840d69c4aefbc81ba63303fb5139
parent 41844eda55fdb325430d622e65dc6ff16c6a61c1

Merge "perfetto: add ability to override upload limit flag on debuggable builds" into pi-dev

perfetto.rc

diff --git a/perfetto.rc b/perfetto.rc
index 23abaf2..8c795ad 100644
--- a/perfetto.rc
+++ b/perfetto.rc
@@ -39,6 +39,12 @@
 on property:sys.traced.enable_override=0
     setprop persist.traced.enable 0
 
+on property:debug.atrace.user_initiated=1
+    stop traced_probes
+
+on property:persist.traced.enable=1 && property:debug.atrace.user_initiated=""
+    start traced_probes
+
 on property:persist.traced.enable=1
     # Trace files need to be:
     # - Written by either uid:shell or uid:statsd.