Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c270b3 authored by Hector Dearman's avatar Hector Dearman Committed by android-build-merger
Browse files

Merge "Don't disable vendor tracing when --only_userspace" am: 957a4193 

am: 314c95e8

Change-Id: I045b73abad1af7f0e873ee8657227df369369d12
parents 6f8f71a2 314c95e8

cmds/atrace/atrace.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -1466,11 +1466,12 @@ int main(int argc, char **argv) 




    // Reset the trace buffer size to 1.

    // Reset the trace buffer size to 1.

    if (traceStop) {

    if (traceStop) {

        cleanUpVendorTracing();

        cleanUpUserspaceTracing();

        cleanUpUserspaceTracing();

        if (!onlyUserspace)

        if (!onlyUserspace) {

            cleanUpVendorTracing();

            cleanUpKernelTracing();

            cleanUpKernelTracing();

        }

        }

    }





    return g_traceAborted ? 1 : 0;

    return g_traceAborted ? 1 : 0;

}
 
}