commit 7fc9d8675edea10f35dca1d135a1789c296dc5f5
author Florian Mayer <fmayer@google.com> Tue Jan 14 09:37:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 14 09:37:04 2020 +0000
tree 98cf0ab141620deb10dc480ff0f229f2e7e17b24
parent 8e7f193ba70d892e1fe8f46c0311d499cd5eab8d
parent 6263b5843b7becb7b91e9735f72dfaa8d18ea98b

Merge "Do not send Binder/HIDL transactions from atrace."

cmds/atrace/atrace.cpp

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();
     }