Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227ff51e authored by Primiano Tucci's avatar Primiano Tucci Committed by Automerger Merge Worker
Browse files

Merge changes Ic9b9cef4,I5e807b64 am: 9779dd4a am: 5d3c096f am: 23d5d806 am: 63d679d2

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

Change-Id: Iae1a41f8ec35e7a682fe36fa8cfa8d5f7f582043
parents fceb229f 63d679d2
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -1225,10 +1225,7 @@ int main(int argc, char **argv)

        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 @@ int main(int argc, char **argv)
        // 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();
        }
        if (ok && !async && !traceStream) {
            // Sleep to allow the trace to be captured.
            struct timespec timeLeft;