Commit ada0a4af authored Apr 09, 2019 by Hector Dearman

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

parent 9305f34d

cmds/atrace/atrace.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -1465,11 +1465,12 @@ 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;
		}