commit dbff33c03add734afd6ef4f2f8ccf79601f06f81
author Martijn Coenen <maco@google.com> Sat Mar 24 07:31:10 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 24 07:31:10 2018 +0000
tree 70e41a7cd236121c3ad448acb34d77255d9bc810
parent ffa8b59bc049e8578c08a93af02728d01fb2bbe8
parent f55115a934d71e50720e64af74babfd9f1002f06

Merge "atrace: support new AIDL trace tag." into pi-dev am: 27bda1e1e0
am: f55115a934

Change-Id: I982b8995633753642ba3d55819615e1f7672e136

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 3d63971..c7b51c8 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -116,7 +116,8 @@
     { "database",   "Database",         ATRACE_TAG_DATABASE, { } },
     { "network",    "Network",          ATRACE_TAG_NETWORK, { } },
     { "adb",        "ADB",              ATRACE_TAG_ADB, { } },
-    { "vibrator",   "Vibrator",         ATRACE_TAG_VIBRATOR, {}},
+    { "vibrator",   "Vibrator",         ATRACE_TAG_VIBRATOR, { } },
+    { "aidl",       "AIDL calls",       ATRACE_TAG_AIDL, { } },
     { k_coreServiceCategory, "Core services", 0, { } },
     { k_pdxServiceCategory, "PDX services", 0, { } },
     { "sched",      "CPU Scheduling",   0, {