commit 72ffcc559011bdfce6670786a8ca702ddeeefb58
author Jonglin Lee <jonglin@google.com> Fri Aug 06 06:36:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 06 06:36:25 2021 +0000
tree 6ccb3594820ebfd2e30aee8beaac7186d0752fe4
parent cc00b4f938f993cc1b358782fefab8d55daa7317
parent 090cd59555cdc2c9e982d9e735acec876430a540

Merge "Revert "binder: SharedRefBase uses enable_shared_from_this"" am: 090cd59555

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

Change-Id: I1f73409487cf9fef167f6c6527e3afd2f110536f

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