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

Commit 0f023053 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 

am: 27c270b3

Change-Id: I58e224511b5038c987a1667b372b53039b94696d
parents 7c6213dd 27c270b3

cmds/atrace/atrace.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1466,11 +1466,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;

}