diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-04-25 12:03:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-25 12:03:56 +0000 |
| commit | 957a41937b834f15d578e987ee0d1e99629ed1b3 (patch) | |
| tree | 2be29fb3ba024a0403cd60222c02e98ffc3bcbf3 | |
| parent | b5187664b926f37fe1bd55106e5b811e029cb5ad (diff) | |
| parent | ada0a4af3f7a50cb47c4e637592d8c57ab9de0cf (diff) | |
| download | native-957a41937b834f15d578e987ee0d1e99629ed1b3.tar.gz | |
Merge "Don't disable vendor tracing when --only_userspace"
| -rw-r--r-- | cmds/atrace/atrace.cpp | 5 |
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; |