commit 5ea61acfd156b9d9a7959ad0708fac44929c4504
author Florian Mayer <fmayer@google.com> Fri Oct 11 03:09:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 11 03:09:55 2019 -0700
tree 1c9a7afa851c23febe716c931f9bc62d5edf4a7a
parent 113fb44b91ae2e4ae8520ed49dffcb36f855e1a7
parent e9afce4c49079d4cac002e3123361d9291d94d2c

Merge "Remove useless goto." am: b8ba80ebd2
am: d91c9eae3f

Change-Id: I5bfe3123e6dbdc07de269c7d0bc8cc4040bcf530

libcutils/trace-dev.cpp

diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp
index 4da8215..bff16c1 100644
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@@ -34,12 +34,9 @@
     if (atrace_marker_fd == -1) {
         ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);
         atrace_enabled_tags = 0;
-        goto done;
+    } else {
+      atrace_enabled_tags = atrace_get_property();
     }
-
-    atrace_enabled_tags = atrace_get_property();
-
-done:
     atomic_store_explicit(&atrace_is_ready, true, memory_order_release);
 }