commit 82370df4e97f632643f0d7ef88a25aca77aa19de
author Jooyung Han <jooyung@google.com> Fri Aug 13 04:57:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 04:57:14 2021 +0000
tree 970e8fb37ff8a6f3a0a03576c6c8a1465e9159e1
parent b6e937d1cdff640a4e941dc5371a11cffc3ad6e5
parent 231bda61aee209a1882d52f25f02642259f9f0da

Merge "Parcel: support unique_ptr for recursive types" am: 231bda61ae

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

Change-Id: I1dec42eb88f7c8c7bfdfe1ec18aa1ba715ad3cd1

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