diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-08-16 03:14:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 03:14:00 +0000 |
| commit | 9612a31003dc84d522728d2481def385d25d20ab (patch) | |
| tree | eb8015861c4f05244d7da372b474d3d174edc158 /cmds | |
| parent | 872f605a30c6a1f3bd2afa053589434194b40cf6 (diff) | |
| parent | c8c5e4c66b858fc41bdb696421eb13c3ea65a238 (diff) | |
| download | frameworks_native-9612a31003dc84d522728d2481def385d25d20ab.zip frameworks_native-9612a31003dc84d522728d2481def385d25d20ab.tar.gz frameworks_native-9612a31003dc84d522728d2481def385d25d20ab.tar.bz2 | |
am c8c5e4c6: Merge "Add trace tag for power management." into lmp-dev
* commit 'c8c5e4c66b858fc41bdb696421eb13c3ea65a238':
Add trace tag for power management.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/atrace/atrace.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 0d71bbd..f124caf 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -77,14 +77,17 @@ 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, { } }, { "audio", "Audio", ATRACE_TAG_AUDIO, { } }, { "video", "Video", ATRACE_TAG_VIDEO, { } }, { "camera", "Camera", ATRACE_TAG_CAMERA, { } }, { "hal", "Hardware Modules", ATRACE_TAG_HAL, { } }, + { "app", "Application", ATRACE_TAG_APP, { } }, { "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } }, { "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } }, { "rs", "RenderScript", ATRACE_TAG_RS, { } }, { "bionic", "Bionic C Library", ATRACE_TAG_BIONIC, { } }, + { "power", "Power Management", ATRACE_TAG_POWER, { } }, { "sched", "CPU Scheduling", 0, { { REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" }, { REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" }, |