commit d184634fef1473df31b460ffe2ad0be95fc164ec
author Steven Moreland <smoreland@google.com> Fri Jul 30 17:17:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 30 17:17:14 2021 +0000
tree 7052e0ff41839762f6c7790e6830c2faa97d643a
parent b9018b05bceaae1d4ef6ee701a02d5b9adb16b32
parent 7b2c012fedd90a86f99752584a229d5a8168a942

Merge "lshal: use libbase HexString" am: 7b2c012fed

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

Change-Id: Icc9393ad5428cfb72c825c60962277032e60cc8e

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