commit ecf935cdba26a6701b760d43128f20e0f8b922eb
author Steven Moreland <smoreland@google.com> Thu Aug 05 17:51:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 05 17:51:29 2021 +0000
tree 56bb4d67f6ee5c1dbaa8338ff65da43d788dc689
parent bce82c3feabf71c9aef6b8ce9e8b7e8d7cebd305
parent 91c6a9f5d8a7a4af33998de62b72e15bc1a3b9bb

Merge "libbinder: allow externally created connections" am: 91c6a9f5d8

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

Change-Id: Ia89173e3f945d305830730abe5b4f57dce25aa26

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