summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hector Dearman <hjd@google.com> 2019-04-09 14:13:14 +0100
committer Hector Dearman <hjd@google.com> 2019-04-09 14:20:35 +0100
commitada0a4af3f7a50cb47c4e637592d8c57ab9de0cf (patch)
tree0c88fede38b916209f447cd0b98971513aef5da2
parent9305f34da2e4733d77bd1c189043938f18cb51c9 (diff)
Don't disable vendor tracing when --only_userspace
We shouldn't disable vendor tracing when the --only_userspace option is set. This matches the "enable vendor tracing" path which is already behind an if (onlyUserspace) guard. Test: make Bug: 130202267 Change-Id: Ia76ee5286c6cf3f69165362dd3ab95f0d7812714
-rw-r--r--cmds/atrace/atrace.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 39b3aacc73..d276696964 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -1465,10 +1465,11 @@ int main(int argc, char **argv)
// Reset the trace buffer size to 1.
if (traceStop) {
- cleanUpVendorTracing();
cleanUpUserspaceTracing();
- if (!onlyUserspace)
+ if (!onlyUserspace) {
+ cleanUpVendorTracing();
cleanUpKernelTracing();
+ }
}
return g_traceAborted ? 1 : 0;