commit 228f4bdaa90543cc1437f232cb2df7760eb7da69
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 13 01:12:48 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 01:12:48 2016 +0000
tree 829fb93eba7718a10f7716c2faaec5cdac40c90a
parent 3c9a97902d6359bda61e05086849de5ed031d71b
parent a42866b4cb9218cc80b8217ff9ad6458c3c4864e

Merge "Make atrace not depend on /dev/hwbinder."

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index c176101..28fca4d 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -518,6 +518,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];