commit e2eac3e68c9ed2e22cb30c2eec40d8bbcd0a719f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 20 07:59:11 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 20 07:59:11 2020 +0000
tree d138503e53690f397bc3dbebb4d41fdab8f0518b
parent 00570299f5bdf40f4ccc2c1609473f92173ffcea
parent 204bca2fd4f027e4e20398dd59ac237fad3d40f1

Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: 2616e4957d am: 204bca2fd4

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

Change-Id: I6b24a622a16c43d21bbd5d592978286535a2fe71

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 08f44c8..2519ffa 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, {