Merge "Check /sys/kernel/tracing for tracefs"

2020-02-01 06:50:45 +00:00 · 2020-02-01 06:50:45 +00:00 · a6c834f960
parent 8fda5feb25 6a879b25d9
commit a6c834f960
1 changed files with 4 additions and 0 deletions
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@ -31,6 +31,10 @@ 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) {
        ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);
        atrace_enabled_tags = 0;