commit 63d679d2eb41ca10dedfb14487beae1b4c38319a
author Primiano Tucci <primiano@google.com> Thu Mar 17 17:02:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 17 17:02:58 2022 +0000
tree 81f141302e43944793e30e588ea83f0fa95ed8c3
parent 69001d85c3149b2e5cd8b41e67c9058b3963a97f
parent 23d5d806fafc211f35bc83aa0b025e849915e023

Merge changes Ic9b9cef4,I5e807b64 am: 9779dd4a6a am: 5d3c096ffd am: 23d5d806fa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2026615

Change-Id: Idaed9c53ac439b95b6f4ded8d65e408bc6cb5a0b

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 08a3d9a..6fb9a4d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -1225,10 +1225,7 @@
 
         if (ret < 0) {
             for (int i = optind; i < argc; i++) {
-                if (!setCategoryEnable(argv[i])) {
-                    fprintf(stderr, "error enabling tracing category \"%s\"\n", argv[i]);
-                    exit(1);
-                }
+                setCategoryEnable(argv[i]);
             }
             break;
         }
@@ -1344,10 +1341,10 @@
         // contain entries from only one CPU can cause "begin" entries without a
         // matching "end" entry to show up if a task gets migrated from one CPU to
         // another.
-        if (!onlyUserspace)
+        if (!onlyUserspace) {
             ok = clearTrace();
-
-        writeClockSyncMarker();
+            writeClockSyncMarker();
+        }
         if (ok && !async && !traceStream) {
             // Sleep to allow the trace to be captured.
             struct timespec timeLeft;