commit a42866b4cb9218cc80b8217ff9ad6458c3c4864e
author Steven Moreland <smoreland@google.com> Mon Dec 12 15:18:06 2016 -0800
committer Steven Moreland <smoreland@google.com> Mon Dec 12 15:18:06 2016 -0800
tree c60f654a9eea4dcd83863e4969efe6b1a08a0be2
parent 68603971f6e88122e3184532924301000c317e03

Make atrace not depend on /dev/hwbinder.

Bug: 31262344
Test: compiles
Change-Id: I2b4fa6815723507dd04afda19e99e5a15053dc66

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f4c6be2..5a34755 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -517,6 +517,12 @@
     using ::android::hardware::hidl_string;
 
     sp<IServiceManager> sm = ::android::hardware::defaultServiceManager();
+
+    if (sm == nullptr) {
+        fprintf(stderr, "failed to get IServiceManager to poke hal services\n");
+        return;
+    }
+
     auto listRet = sm->list([&](const auto &interfaces) {
         for (size_t i = 0; i < interfaces.size(); i++) {
             string fqInstanceName = interfaces[i];