commit 7102c3d959e69f46a262b1de3da9454f76e8527a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 07:00:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 01 07:00:51 2020 +0000
tree e6d2ebe24dc0b953837f7341bf51c9009b3530f1
parent 3ccf567ab81e12dfe7167200e08fbcfe0186a709
parent ce5caca5b3105187f35228142ff4ff569ba87c3d

Remove libmetricslogger dependency from bootstats am: fe0b389190

Change-Id: Ibf52227cd46b8616de79b69d6e62fe9f7eaff4d3

libcutils/trace-dev.cpp

diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp
index 2ee39d3..9ca1729 100644
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@@ -32,6 +32,10 @@
 {
     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;
     } else {