commit 7d54b9ea2ec0c6753d8b058e650a845d85a02a24
author Florian Mayer <fmayer@google.com> Fri Oct 11 03:21:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 11 03:21:20 2019 -0700
tree b570e0354422531efc5adf5d1823eb6bfb406d3e
parent 74ab1b38ec15a4aa727221cf7f27a148c48fbd86
parent 9c45c83ff20876bd86a77b1267f83f083252c28b

Merge "Remove useless goto." am: b8ba80ebd2 am: d91c9eae3f am: 8a384bb5ef
am: 324b5c010d

Change-Id: Id0c452f06faa036a7de81079ade5c4737423f4de

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);
 }