Merge "Revert "atrace: add ufshcd_command event and change block events for disk category"" am: cd8e35be03 am: 292b315062 am: cb5d2e1aba am: 8ab606ab42 am: 6a5442126e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237180
Change-Id: I43682bdddb7d30a8c277c0e33e43c198af1d5fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 5cd2dea..6fb9a4d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -193,9 +193,8 @@
{ OPT, "events/ext4/ext4_da_write_end/enable" },
{ OPT, "events/ext4/ext4_sync_file_enter/enable" },
{ OPT, "events/ext4/ext4_sync_file_exit/enable" },
- { REQ, "events/block/block_bio_queue/enable" },
- { REQ, "events/block/block_bio_complete/enable" },
- { REQ, "events/ufs/ufshcd_command/enable" },
+ { REQ, "events/block/block_rq_issue/enable" },
+ { REQ, "events/block/block_rq_complete/enable" },
} },
{ "mmc", "eMMC commands", 0, {
{ REQ, "events/mmc/enable" },