commit 3b5cb7cfa7990e67401d935a62e82d42e82338a2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 26 19:46:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 26 19:46:04 2017 +0000
tree 853ce2dfa1cdd687fa112d3c6eed02707f004462
parent 38588847653e03ce3d7e2858c494ab1976b0b029
parent 38d8ab18dcaf0ec85e44f3e5ae8ee5291de574a5

Merge changes Ibe91fd2d,I59e2bd9e

* changes:
  init: remove 'computing context for service'... message
  init: use full command for exec services' names

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 961926a..2284a21 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -634,7 +634,6 @@
     if (!seclabel_.empty()) {
         scon = seclabel_;
     } else {
-        LOG(INFO) << "computing context for service '" << name_ << "'";
         scon = ComputeContextFromExecutable(name_, args_[0]);
         if (scon == "") {
             return false;
@@ -926,7 +925,9 @@
     std::vector<std::string> str_args(args.begin() + command_arg, args.end());
 
     exec_count_++;
-    std::string name = StringPrintf("exec %d (%s)", exec_count_, str_args[0].c_str());
+    std::string name =
+        "exec " + std::to_string(exec_count_) + " (" + android::base::Join(str_args, " ") + ")";
+
     unsigned flags = SVC_EXEC | SVC_ONESHOT | SVC_TEMPORARY;
     CapSet no_capabilities;
     unsigned namespace_flags = 0;