commit 139aca452a3e4ae9a9996eb7675eec9126edb8a9
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 20 18:15:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 20 18:15:59 2021 +0000
tree 4c71885104b95c7220361c8a9bed63126257f7b1
parent ecd2fe231ccc3eaef88a7f772aa1220649490106
parent 90c5657748eb512a6c94376278039b0f2ac4e740

Merge "Revert "Add systrace tag for system property"" into sc-dev-plus-aosp am: 32849a37a5 am: 90c5657748

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

Change-Id: I619b8de8e5575bc93022b735f9f8a46693df1681

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 021fdb5..9a8ec32 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -126,7 +126,6 @@
     { "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, {