commit 0f02305352afe32961563afa8ddacd1e3aaf21e6
author Hector Dearman <hjd@google.com> Thu Apr 25 05:31:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 25 05:31:07 2019 -0700
tree 38edc61571474704eadf53463050f5b1d63cd4b0
parent 7c6213dd8d68d8868f73a18198573d37d3ee47d0
parent 27c270b3183af4ee9f6c3fbeac53c54e237eb49d

Merge "Don't disable vendor tracing when --only_userspace" am: 957a41937b am: 314c95e822
am: 27c270b318

Change-Id: I58e224511b5038c987a1667b372b53039b94696d

cmds/atrace/atrace.cpp

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