commit 957a41937b834f15d578e987ee0d1e99629ed1b3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 25 12:03:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 25 12:03:56 2019 +0000
tree 2be29fb3ba024a0403cd60222c02e98ffc3bcbf3
parent b5187664b926f37fe1bd55106e5b811e029cb5ad
parent ada0a4af3f7a50cb47c4e637592d8c57ab9de0cf

Merge "Don't disable vendor tracing when --only_userspace"

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;