summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalamurugan Thanikachalam <bthanika@codeaurora.org>2014-10-24 03:31:55 +0530
committerSteve Kondik <steve@cyngn.com>2014-12-08 00:32:37 -0800
commit37b16c838c0ac14742de83a6cc95c74ca89c7aee (patch)
treed32259c313449dfede65c9304baf09ff5cdb379e
parent37fbf662e3e1549a9710d9661f9c584744f5a0e5 (diff)
downloadandroid_frameworks_native-37b16c838c0ac14742de83a6cc95c74ca89c7aee.tar.gz
android_frameworks_native-37b16c838c0ac14742de83a6cc95c74ca89c7aee.tar.bz2
android_frameworks_native-37b16c838c0ac14742de83a6cc95c74ca89c7aee.zip
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
-rw-r--r--cmds/atrace/atrace.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 9e5c91068..a92f4383e 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -77,7 +77,7 @@ static const TracingCategory k_categories[] = {
{ "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, { } },