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

Commit 355ff8c7 authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

libcutils must check /sys/kernel/tracing for tracefs first 

Currently it falls back to /sys/kernel/tracing if debugfs is not found.
/sys/kernel/tracing must be checked first since debugfs is not allowed
to be mounted in user builds starting with Android R launching devices.

Test: manual
Change-Id: I2fb5ec91bbf7d5304a1a6efcb06530969485e78f
parent 72a0f10f

libcutils/trace-dev.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ void atrace_set_tracing_enabled(bool enabled) 


static void atrace_init_once()

{

    atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

    if (atrace_marker_fd == -1) {

    atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

    if (atrace_marker_fd == -1) {

        atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

    }



    if (atrace_marker_fd == -1) {