commit 6de2eb3523a4f82da80823c83b7b0b1adc9c3e7e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 11 03:27:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 03:27:49 2021 +0000
tree 19f8760064d8e0713d9dea5e78d6e462a834fcfe
parent f3c49f3802ede8e83c128c357cc7530b1fae8a5e
parent 1291f27a242b61dc26f2a448a69180f50498c772

Merge "binder: don't specify POLLHUP in .events for poll()" am: 1291f27a24

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

Change-Id: Ib6b4f2b96bc141bc61394722d8b864d6446f01c2

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, {