commit b742a8112e601561e838a0533ad508ab6c676acb
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 21 11:56:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 21 11:56:23 2021 +0000
tree a365439bbb7028cf48cd890ea7541e7edc727644
parent 0f2dc47842b591a11d69e797f03e5c544c738ba3
parent c18818c651a5c99c3945d455fb1f9045ca79322c

[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: c18818c651 -s ours

am skip reason: Merged-In I1ba9fc7bddd93aa0dc9a0ded8600c08e6ace886b with SHA-1 a9cbe47961 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1403308

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

Change-Id: I591f37d9bd8b0c55ff4850cda1153e7ae1f9fe9f

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 287dd48..6f5f70d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -124,6 +124,7 @@
     { "aidl",       "AIDL calls",               ATRACE_TAG_AIDL, { } },
     { "nnapi",      "NNAPI",                    ATRACE_TAG_NNAPI, { } },
     { "rro",        "Runtime Resource Overlay", ATRACE_TAG_RRO, { } },
+    { "sysprop",    "System Property",          ATRACE_TAG_SYSPROP, { } },
     { k_coreServiceCategory, "Core services", 0, { } },
     { k_pdxServiceCategory, "PDX services", 0, { } },
     { "sched",      "CPU Scheduling",   0, {