Do not send Binder/HIDL transactions from atrace.
Change order of setting the cmdline property and the enabled tags,
because we re-read the former when the latter changes, so we need to
update the cmdlines first.
Test: adb shell su root atrace -t 10 ss
Test: adb shell su root atrace -t 10 -a com.android.messaging
Bug: 137366208
Change-Id: I336a1339f5e992763854aea32ba0bac0a3146288
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 5186ad3..cf75bba 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -854,7 +854,6 @@
tags |= c.tags;
}
}
- ok &= setTagsProperty(tags);
bool coreServicesTagEnabled = false;
for (size_t i = 0; i < arraysize(k_categories); i++) {
@@ -876,9 +875,11 @@
packageList += android::base::GetProperty(k_coreServicesProp, "");
}
ok &= setAppCmdlineProperty(&packageList[0]);
+ ok &= setTagsProperty(tags);
+#if !ATRACE_SHMEM
ok &= pokeBinderServices();
pokeHalServices();
-
+#endif
if (g_tracePdx) {
ok &= ServiceUtility::PokeServices();
}