commit 787b0de6e16017f886d1f20b56241c81968d5482
author Balamurugan Thanikachalam <bthanika@codeaurora.org> Fri Oct 24 03:31:55 2014 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 14 09:57:50 2014 -0800
tree e558aa4aeaa05bc8ab3462cbf96c09b8696a024b
parent 2f67fa55cc7fa572894418f278419955c6a3cb27

atrace: fix duplicate tag 'sync'

Recent AOSP commit added a tag 'sync' for ATRACE_TAG_SYNC_MANAGER but
the tag 'sync' was already being used for "Synchronization" events.

Due to this conflict, the Synchronization events are not enabled
anymore with the name duplication. To avoid this,'sync' for
sync_manager is renamed to 'sm'

Change-Id: Ieb7b504e63f0eadc8d889af9cfed217287c75a6b

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 9e5c910..a92f438 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -77,7 +77,7 @@
     { "webview",    "WebView",          ATRACE_TAG_WEBVIEW, { } },
     { "wm",         "Window Manager",   ATRACE_TAG_WINDOW_MANAGER, { } },
     { "am",         "Activity Manager", ATRACE_TAG_ACTIVITY_MANAGER, { } },
-    { "sync",       "Sync Manager",     ATRACE_TAG_SYNC_MANAGER, { } },
+    { "sm",       "Sync Manager",     ATRACE_TAG_SYNC_MANAGER, { } },
     { "audio",      "Audio",            ATRACE_TAG_AUDIO, { } },
     { "video",      "Video",            ATRACE_TAG_VIDEO, { } },
     { "camera",     "Camera",           ATRACE_TAG_CAMERA, { } },