commit 314c95e822f0c58ec3e9e0300c75dc0ad08fb6c3
author Hector Dearman <hjd@google.com> Thu Apr 25 05:21:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 25 05:21:41 2019 -0700
tree 9f5b26099dd7d84787f739340a309eb428a14291
parent e286fc03b861925a44516d359a11354c634eb1c8
parent 957a41937b834f15d578e987ee0d1e99629ed1b3

Merge "Don't disable vendor tracing when --only_userspace"
am: 957a41937b

Change-Id: Ie5e1b40ce54a63bbe947ec8f5e74654fe80b3b5f

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 39b3aac..d276696 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -1465,10 +1465,11 @@
 
     // Reset the trace buffer size to 1.
     if (traceStop) {
-        cleanUpVendorTracing();
         cleanUpUserspaceTracing();
-        if (!onlyUserspace)
+        if (!onlyUserspace) {
+            cleanUpVendorTracing();
             cleanUpKernelTracing();
+        }
     }
 
     return g_traceAborted ? 1 : 0;